[ANDROSDK-2181] use internal suspend methods instead of blockinggets

taridepaco · taridepaco · commit da9853acba5b · 2025-10-22T13:52:58.000+02:00
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
@@ -149,7 +149,7 @@ internal class AnalyticsServiceMetadataHelper(
                         ?: throw AnalyticsException.InvalidIndicator(item.uid)
 
                 is DimensionItem.DataItem.ProgramIndicatorItem ->
-                    programIndicatorRepository.withAnalyticsPeriodBoundaries().uid(item.uid).blockingGet()
+                    programIndicatorRepository.withAnalyticsPeriodBoundaries().uid(item.uid).getInternal()
                         ?.let { programIndicator -> MetadataItem.ProgramIndicatorItem(programIndicator) }
                         ?: throw AnalyticsException.InvalidProgramIndicator(item.uid)
 
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
@@ -128,7 +128,7 @@ internal interface IndicatorDataItem : ExpressionItem {
                 val programIndicator = visitor.indicatorContext!!.programIndicatorRepository
                     .withAnalyticsPeriodBoundaries()
                     .uid(dataItem.uid)
-                    .blockingGet()
+                    .getInternal()
                     ?: throw AnalyticsException.InvalidProgramIndicator(dataItem.uid)
 
                 dataItem.uid to MetadataItem.ProgramIndicatorItem(programIndicator)
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
@@ -68,7 +68,7 @@ internal class EventLineListServiceImpl(
     @Suppress("LongMethod", "ComplexMethod")
     private suspend fun evaluateEvents(params: EventLineListParams): List<LineListResponse> {
         val events = getEvents(params)
-        val programStage = programStageRepository.uid(params.programStage).blockingGet()
+        val programStage = programStageRepository.uid(params.programStage).getInternal()
 
         val metadataMap = getMetadataMap(
             params.dataElements,
@@ -80,15 +80,15 @@ internal class EventLineListServiceImpl(
             dataValueRepository
                 .byEvent().`in`(events.map { it.uid() })
                 .byDataElement().`in`(params.dataElements.map { it.uid })
-                .blockingGet()
+                .getInternal()
         } else {
             listOf()
         }
 
         return events.mapNotNull {
             (it.eventDate() ?: it.dueDate())?.let { referenceDate ->
                 val periodType = programStage?.periodType() ?: PeriodType.Daily
-                val eventPeriod = periodHelper.blockingGetPeriodForPeriodTypeAndDate(periodType, referenceDate)
+                val eventPeriod = periodHelper.getPeriodForPeriodTypeAndDateInternal(periodType, referenceDate)
 
                 val eventDataValues = params.dataElements.map { de ->
                     val dv = dataElementValues.find { dv -> dv.event() == it.uid() && dv.dataElement() == de.uid }
@@ -164,7 +164,7 @@ internal class EventLineListServiceImpl(
         }
 
         return if (params.eventDates.isNullOrEmpty()) {
-            repoBuilder.blockingGet()
+            repoBuilder.getInternal()
         } else {
             params.eventDates.flatMap { filter ->
                 var innerBuilder = repoBuilder
@@ -174,7 +174,7 @@ internal class EventLineListServiceImpl(
                 dateFilterPeriodHelper.getEndDate(filter)?.let {
                     innerBuilder = innerBuilder.byEventDate().beforeOrEqual(it)
                 }
-                innerBuilder.blockingGet()
+                innerBuilder.getInternal()
             }
         }
     }
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
@@ -63,7 +63,7 @@ abstract class ReadOnlyObjectRepositoryImpl<M, R : ReadOnlyObjectRepository<M>>
         return runBlocking { getInternal() }
     }
 
-    protected suspend fun getInternal(): M? {
+    internal suspend fun getInternal(): M? {
         return ChildrenAppenderExecutor.appendInObject(
             blockingGetWithoutChildren(),
             childrenAppenderGetter,
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
@@ -73,7 +73,7 @@ internal constructor(
         return runBlocking { getInternal() }
     }
 
-    private suspend fun getInternal(): T? {
+    internal suspend fun getInternal(): T? {
         val item = ChildrenAppenderExecutor.appendInObject(
             getWithoutChildrenInternal(),
             childrenAppenders,
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
@@ -82,7 +82,7 @@ class DataSetCompleteRegistrationObjectRepository internal constructor(
     private suspend fun setInternal() {
         val dataSetCompleteRegistration = getWithoutChildrenInternal()
         if (dataSetCompleteRegistration == null) {
-            val username = credentialsRepository.blockingGet()!!.username()
+            val username = credentialsRepository.getInternal()!!.username()
             dataSetCompleteRegistrationStore.insert(
                 DataSetCompleteRegistration.builder()
                     .period(period)
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
@@ -83,7 +83,7 @@ internal class EnrollmentServiceImpl(
         trackedEntityInstanceUid: String,
         programUid: String,
     ): EnrollmentAccess {
-        val program = programRepository.uid(programUid).blockingGet() ?: return EnrollmentAccess.NO_ACCESS
+        val program = programRepository.uid(programUid).getInternal() ?: return EnrollmentAccess.NO_ACCESS
 
         val dataAccess =
             if (program.access()?.data()?.write() == true) {
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
@@ -71,7 +71,7 @@ internal class EventQueryBundleInternalFactory(
             eventFilterCollectionRepository
                 .byUid().`in`(it)
                 .withEventDataFilters()
-                .blockingGet()
+                .getInternal()
         }
 
         val builder = EventQueryBundle.builder()
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
@@ -85,8 +85,8 @@ internal class DataSetIndicatorEngineImpl(
         orgUnitUid: String,
         attributeOptionComboUid: String,
     ): Double {
-        val indicator = indicatorRepository.uid(indicatorUid).blockingGet()
-        val indicatorType = indicatorTypeRepository.uid(indicator?.indicatorType()?.uid()).blockingGet()
+        val indicator = indicatorRepository.uid(indicatorUid).getInternal()
+        val indicatorType = indicatorTypeRepository.uid(indicator?.indicatorType()?.uid()).getInternal()
 
         return if (indicator != null && indicatorType != null) {
             val context = ExpressionServiceContext(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodHelper.kt
@@ -100,7 +100,7 @@ class PeriodHelper internal constructor(
         return runBlocking { getPeriodForPeriodTypeAndDateInternal(periodType, date, periodOffset) }
     }
 
-    private suspend fun getPeriodForPeriodTypeAndDateInternal(
+    internal suspend fun getPeriodForPeriodTypeAndDateInternal(
         periodType: PeriodType,
         date: Date,
         periodOffset: Int = 0,
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
@@ -110,7 +110,7 @@ internal class ProgramIndicatorEngineImpl(
             .withTrackedEntityDataValues()
             .byDeleted().isFalse
             .uid(eventUid)
-            .blockingGet() ?: throw NoSuchElementException("Event $eventUid does not exist or is deleted.")
+            .getInternal() ?: throw NoSuchElementException("Event $eventUid does not exist or is deleted.")
 
         val enrollment = event.enrollment()?.let {
             enrollmentStore.selectByUid(it)
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
@@ -36,6 +36,7 @@ import org.hisp.dhis.android.core.imports.internal.RelationshipImportSummary
 import org.hisp.dhis.android.core.imports.internal.conflicts.RelationshipNotFoundConflict
 import org.hisp.dhis.android.core.relationship.Relationship
 import org.hisp.dhis.android.core.relationship.RelationshipCollectionRepository
+import org.hisp.dhis.android.core.relationship.RelationshipObjectRepository
 import org.koin.core.annotation.Singleton
 
 @Singleton
@@ -62,7 +63,8 @@ internal class RelationshipImportHandler internal constructor(
         importSummary: RelationshipImportSummary,
         relationshipUid: String,
     ) {
-        val relationship = relationshipRepository.withItems().uid(relationshipUid).blockingGet()
+        val relationship =
+            (relationshipRepository.withItems().uid(relationshipUid) as RelationshipObjectRepository).getInternal()
         val relationshipNotFoundOnServer = checkRelationshipNotFoundOnServer(importSummary)
 
         if (relationshipNotFoundOnServer) {
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
@@ -40,8 +40,8 @@ class AnalyticsSettingObjectRepository internal constructor(
 ) : ReadOnlyAnyObjectWithDownloadRepositoryImpl<AnalyticsSettings>(analyticsSettingCall),
     ReadOnlyWithDownloadObjectRepository<AnalyticsSettings> {
     override suspend fun getInternal(): AnalyticsSettings? {
-        val analyticsTeiSettings = analyticsTeiSettingRepository.blockingGet()
-        val analyticsDhisVisualizationsSetting = analyticsDhisVisualizationsSettingObjectRepository.blockingGet()
+        val analyticsTeiSettings = analyticsTeiSettingRepository.getInternal()
+        val analyticsDhisVisualizationsSetting = analyticsDhisVisualizationsSettingObjectRepository.getInternal()
 
         return AnalyticsSettings.builder()
             .tei(analyticsTeiSettings)
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
@@ -43,8 +43,8 @@ class SynchronizationSettingObjectRepository internal constructor(
     ReadOnlyWithDownloadObjectRepository<SynchronizationSettings> {
     override suspend fun getInternal(): SynchronizationSettings? {
         val syncSettings = syncStore.selectAll()
-        val dataSetSettings = dataSetSettingsRepository.blockingGet()
-        val programSettings = programSettingsRepository.blockingGet()
+        val dataSetSettings = dataSetSettingsRepository.getInternal()
+        val programSettings = programSettingsRepository.getInternal()
 
         return if (syncSettings.isEmpty() && dataSetSettings == null && programSettings == null) {
             null
diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/DataSetsStore.kt b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/DataSetsStore.kt
@@ -99,7 +99,7 @@ internal class DataSetsStore(
             .byPeriod().eq(period)
             .byAttributeOptionComboUid().eq(attributeOptionComboUid)
             .one()
-            .blockingGet()
+            .getInternal()
             ?.let { dataSetStore.setState(it, state) }
     }
 }
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
@@ -415,7 +415,7 @@ class TrackedEntityAttributeReservedValueManager internal constructor(
         return if (minNumberOfValuesToHave == null) {
             val reservedValueSetting = reservedValueSettingStore.selectByUid(attribute)
             if (reservedValueSetting?.numberOfValuesToReserve() == null) {
-                val generalSettings = generalSettingObjectRepository.blockingGet()
+                val generalSettings = generalSettingObjectRepository.getInternal()
                 if (generalSettings?.reservedValues() == null) {
                     FILL_UP_TO
                 } else {
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
@@ -254,7 +254,7 @@ internal class OldTrackerImporterPayloadGenerator internal constructor(
             relationships = relationshipRepository.bySyncState()
                 .`in`(State.uploadableStatesIncludingError().toList())
                 .withItems()
-                .blockingGet(),
+                .getInternal(),
         )
     }
 
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
@@ -79,15 +79,15 @@ internal class TrackerQueryBundleInternalFactory(
                 .byUid().`in`(it)
                 .withAttributeValueFilters()
                 .withDataFilters()
-                .blockingGet()
+                .getInternal()
         }
 
         val trackedEntityInstanceFiltersSettings = filters.takeIf { !it.isNullOrEmpty() }?.let {
             trackedEntityInstanceFilterCollectionRepository
                 .byUid().`in`(it)
                 .withTrackedEntityInstanceEventFilters()
                 .withAttributeValueFilters()
-                .blockingGet()
+                .getInternal()
         }
 
         val builder = TrackerQueryBundle.builder()
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
@@ -48,7 +48,7 @@ internal abstract class TrackerQueryFactory<T, S : TrackerBaseSync>(
 
     @Suppress("NestedBlockDepth")
     suspend fun getQueries(params: ProgramDataDownloadParams): List<T> {
-        val programSettings = programSettingsObjectRepository.blockingGet()
+        val programSettings = programSettingsObjectRepository.getInternal()
         val internalFactory = internalFactoryCreator.invoke(params, programSettings)
         lastUpdatedManager.prepare(programSettings, params)
         return if (!params.hasProgramOrFilters()) {
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
@@ -248,7 +248,7 @@ class TrackedEntityInstanceQueryCollectionRepository internal constructor(
         return if (scope.mode() == RepositoryMode.OFFLINE_ONLY || scope.mode() == RepositoryMode.OFFLINE_FIRST) {
             getDataFetcher().queryAllOfflineUids()
         } else {
-            getUids(blockingGet()).toList()
+            getUids(getProtected()).toList()
         }
     }
 
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
@@ -207,7 +207,7 @@ class TrackedEntitySearchCollectionRepository internal constructor(
         return if (scope.mode() == RepositoryMode.OFFLINE_ONLY || scope.mode() == RepositoryMode.OFFLINE_FIRST) {
             getDataFetcher().queryAllOfflineUids()
         } else {
-            UidsHelper.getUids(blockingGet()).toList()
+            UidsHelper.getUids(getInternal()).toList()
         }
     }
 
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
@@ -49,10 +49,21 @@ class UserCredentialsObjectRepository internal constructor(
     transformer,
 ) {
 
+    private val delegate = ReadOnlyWithTransformerObjectRepositoryImpl(
+        store,
+        childrenAppenders,
+        scope,
+        transformer,
+    )
+
     private val cf: FilterConnectorFactory<UserCredentialsObjectRepository> = FilterConnectorFactory(scope) { s ->
         UserCredentialsObjectRepository(store, s, transformer)
     }
 
+    internal suspend fun getInternal(): UserCredentials? {
+        return delegate.getInternal()
+    }
+
     fun withUserRoles(): UserCredentialsObjectRepository {
         return cf.withChild(USER_ROLES)
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/persistence/db/access/RoomDatabaseManager.kt b/core/src/main/java/org/hisp/dhis/android/persistence/db/access/RoomDatabaseManager.kt
@@ -115,6 +115,9 @@ internal class RoomDatabaseManager(
             .setTransactionExecutor(singleThreadExecutor)
             .addMigrations(*ALL_MIGRATIONS.toTypedArray())
             .openHelperFactory(factory)
+            .setQueryCallback({ sqlQuery, bindArgs ->
+                println("SQL Query: $sqlQuery SQL Args: $bindArgs")
+            }, Executors.newSingleThreadExecutor())
             .build()
         databaseAdapter.activate(database, databaseName)
         return databaseAdapter
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
@@ -84,13 +84,13 @@ class EnrollmentServiceShould {
     private lateinit var enrollmentService: EnrollmentService
 
     @Before
-    fun setUp() {
+    fun setUp() = runTest {
         whenever(enrollmentRepository.uid(enrollmentUid).blockingGet()) doReturn enrollment
         whenever(
             trackedEntityInstanceRepository
-                .uid(trackedEntityInstanceUid).blockingGet(),
+                .uid(trackedEntityInstanceUid).getInternal(),
         ) doReturn trackedEntityInstance
-        whenever(programRepository.uid(programUid).blockingGet()) doReturn program
+        whenever(programRepository.uid(programUid).getInternal()) doReturn program
 
         whenever(enrollment.uid()) doReturn enrollmentUid
         whenever(trackedEntityInstance.organisationUnit()) doReturn organisationUnitId
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
@@ -96,7 +96,7 @@ class EventQueryBundleFactoryShould {
         whenever(userOrganisationUnitLinkStore.queryOrganisationUnitUidsByScope(any()))
             .thenReturn(captureOrgUnits)
 
-        whenever(programSettingsObjectRepository.blockingGet()).thenReturn(programSettings)
+        whenever(programSettingsObjectRepository.getInternal()).thenReturn(programSettings)
 
         whenever(eventFilterCollectionRepository.byUid()).thenReturn(connectorEvent)
         whenever(connectorEvent.`in`(null)).thenReturn(eventFilterCollectionRepository)
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
@@ -36,6 +36,7 @@ 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 org.hisp.dhis.android.core.relationship.RelationshipItem
+import org.hisp.dhis.android.core.relationship.RelationshipObjectRepository
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -54,6 +55,8 @@ class RelationshipImportHandlerShould {
     private val relationshipCollectionRepository: RelationshipCollectionRepository =
         mock(defaultAnswer = Answers.RETURNS_DEEP_STUBS)
 
+    private val relationshipObjectRepository: RelationshipObjectRepository = mock()
+
     private val importSummary: RelationshipImportSummary = mock()
 
     private val relationship: Relationship = mock()
@@ -66,11 +69,12 @@ class RelationshipImportHandlerShould {
 
     @Before
     @Throws(Exception::class)
-    fun setUp() {
+    fun setUp() = runTest {
         relationshipImportHandler =
             RelationshipImportHandler(relationshipStore, dataStatePropagator, relationshipCollectionRepository)
 
-        whenever(relationshipCollectionRepository.withItems().uid(any()).blockingGet()).doReturn(relationship)
+        whenever(relationshipCollectionRepository.withItems().uid(any())).doReturn(relationshipObjectRepository)
+        whenever(relationshipObjectRepository.getInternal()).doReturn(relationship)
         whenever(relationship.from()).doReturn(relationshipItem)
     }
 
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
@@ -108,7 +108,7 @@ class TrackedEntityInstanceQueryFactoryShould {
         whenever(programStore.getUidsByProgramType(any())).thenReturn(
             listOf(p1, p2, p3),
         )
-        whenever(programSettingsObjectRepository.blockingGet()).thenReturn(programSettings)
+        whenever(programSettingsObjectRepository.getInternal()).thenReturn(programSettings)
 
         whenever(programStageWorkingListObjectRepository.byUid()).thenReturn(connectorWorkingList)
         whenever(connectorWorkingList.`in`(null)).thenReturn(programStageWorkingListObjectRepository)

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ abstract class ReadOnlyObjectRepositoryImpl<M, R : ReadOnlyObjectRepository<M>>`
`63`	`63`	`return runBlocking { getInternal() }`
`64`	`64`	`}`
`65`	`65`
`66`		`- protected suspend fun getInternal(): M? {`
	`66`	`+ internal suspend fun getInternal(): M? {`
`67`	`67`	`return ChildrenAppenderExecutor.appendInObject(`
`68`	`68`	`blockingGetWithoutChildren(),`
`69`	`69`	`childrenAppenderGetter,`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ internal constructor(`
`73`	`73`	`return runBlocking { getInternal() }`
`74`	`74`	`}`
`75`	`75`
`76`		`- private suspend fun getInternal(): T? {`
	`76`	`+ internal suspend fun getInternal(): T? {`
`77`	`77`	`val item = ChildrenAppenderExecutor.appendInObject(`
`78`	`78`	`getWithoutChildrenInternal(),`
`79`	`79`	`childrenAppenders,`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ internal class EventQueryBundleInternalFactory(`
`71`	`71`	`eventFilterCollectionRepository`
`72`	`72`	.byUid().`in`(it)
`73`	`73`	`.withEventDataFilters()`
`74`		`- .blockingGet()`
	`74`	`+ .getInternal()`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`val builder = EventQueryBundle.builder()`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ class PeriodHelper internal constructor(`
`100`	`100`	`return runBlocking { getPeriodForPeriodTypeAndDateInternal(periodType, date, periodOffset) }`
`101`	`101`	`}`
`102`	`102`
`103`		`- private suspend fun getPeriodForPeriodTypeAndDateInternal(`
	`103`	`+ internal suspend fun getPeriodForPeriodTypeAndDateInternal(`
`104`	`104`	`periodType: PeriodType,`
`105`	`105`	`date: Date,`
`106`	`106`	`periodOffset: Int = 0,`