From c86f25824ae510c97256aae9349d7644a47aaed4 Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Wed, 16 Nov 2022 10:47:53 +0100 Subject: [PATCH] rename classes --- .../info/nightscout/database/impl/DelegatedAppDatabase.kt | 8 ++++---- .../impl/daos/delegated/DelegatedAPSResultLinkDao.kt | 2 +- .../impl/daos/delegated/DelegatedExtendedBolusDao.kt | 2 +- .../InvalidateTemporaryBasalTransactionWithPumpId.kt | 4 +--- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/database/impl/src/main/java/info/nightscout/database/impl/DelegatedAppDatabase.kt b/database/impl/src/main/java/info/nightscout/database/impl/DelegatedAppDatabase.kt index ad6ecf8430..c8865506af 100644 --- a/database/impl/src/main/java/info/nightscout/database/impl/DelegatedAppDatabase.kt +++ b/database/impl/src/main/java/info/nightscout/database/impl/DelegatedAppDatabase.kt @@ -21,13 +21,13 @@ import info.nightscout.database.impl.daos.TotalDailyDoseDao import info.nightscout.database.impl.daos.UserEntryDao import info.nightscout.database.impl.daos.VersionChangeDao import info.nightscout.database.impl.daos.delegated.DelegatedAPSResultDao -import info.nightscout.database.impl.daos.delegated.DelegatedAPSResultLinkLinkDao +import info.nightscout.database.impl.daos.delegated.DelegatedAPSResultLinkDao import info.nightscout.database.impl.daos.delegated.DelegatedBolusCalculatorResultDao import info.nightscout.database.impl.daos.delegated.DelegatedBolusDao import info.nightscout.database.impl.daos.delegated.DelegatedCarbsDao import info.nightscout.database.impl.daos.delegated.DelegatedDeviceStatusDao import info.nightscout.database.impl.daos.delegated.DelegatedEffectiveProfileSwitchDao -import info.nightscout.database.impl.daos.delegated.DelegatedExtendedExtendedBolusDao +import info.nightscout.database.impl.daos.delegated.DelegatedExtendedBolusDao import info.nightscout.database.impl.daos.delegated.DelegatedFoodDao import info.nightscout.database.impl.daos.delegated.DelegatedGlucoseValueDao import info.nightscout.database.impl.daos.delegated.DelegatedMultiwaveBolusLinkDao @@ -48,12 +48,12 @@ internal class DelegatedAppDatabase(val changes: MutableList, val datab val therapyEventDao: TherapyEventDao = DelegatedTherapyEventDao(changes, database.therapyEventDao) val temporaryBasalDao: TemporaryBasalDao = DelegatedTemporaryBasalDao(changes, database.temporaryBasalDao) val bolusDao: BolusDao = DelegatedBolusDao(changes, database.bolusDao) - val extendedBolusDao: ExtendedBolusDao = DelegatedExtendedExtendedBolusDao(changes, database.extendedBolusDao) + val extendedBolusDao: ExtendedBolusDao = DelegatedExtendedBolusDao(changes, database.extendedBolusDao) val multiwaveBolusLinkDao: MultiwaveBolusLinkDao = DelegatedMultiwaveBolusLinkDao(changes, database.multiwaveBolusLinkDao) val totalDailyDoseDao: TotalDailyDoseDao = DelegatedTotalDailyDoseDao(changes, database.totalDailyDoseDao) val carbsDao: CarbsDao = DelegatedCarbsDao(changes, database.carbsDao) val temporaryTargetDao: TemporaryTargetDao = DelegatedTemporaryTargetDao(changes, database.temporaryTargetDao) - val apsResultLinkDao: APSResultLinkDao = DelegatedAPSResultLinkLinkDao(changes, database.apsResultLinkDao) + val apsResultLinkDao: APSResultLinkDao = DelegatedAPSResultLinkDao(changes, database.apsResultLinkDao) val bolusCalculatorResultDao: BolusCalculatorResultDao = DelegatedBolusCalculatorResultDao(changes, database.bolusCalculatorResultDao) val effectiveProfileSwitchDao: EffectiveProfileSwitchDao = DelegatedEffectiveProfileSwitchDao(changes, database.effectiveProfileSwitchDao) val profileSwitchDao: ProfileSwitchDao = DelegatedProfileSwitchDao(changes, database.profileSwitchDao) diff --git a/database/impl/src/main/java/info/nightscout/database/impl/daos/delegated/DelegatedAPSResultLinkDao.kt b/database/impl/src/main/java/info/nightscout/database/impl/daos/delegated/DelegatedAPSResultLinkDao.kt index a165536fcd..756b07c20f 100644 --- a/database/impl/src/main/java/info/nightscout/database/impl/daos/delegated/DelegatedAPSResultLinkDao.kt +++ b/database/impl/src/main/java/info/nightscout/database/impl/daos/delegated/DelegatedAPSResultLinkDao.kt @@ -4,7 +4,7 @@ import info.nightscout.database.impl.daos.APSResultLinkDao import info.nightscout.database.entities.APSResultLink import info.nightscout.database.entities.interfaces.DBEntry -internal class DelegatedAPSResultLinkLinkDao(changes: MutableList, private val dao: APSResultLinkDao) : DelegatedDao(changes), APSResultLinkDao by dao { +internal class DelegatedAPSResultLinkDao(changes: MutableList, private val dao: APSResultLinkDao) : DelegatedDao(changes), APSResultLinkDao by dao { override fun insertNewEntry(entry: APSResultLink): Long { changes.add(entry) diff --git a/database/impl/src/main/java/info/nightscout/database/impl/daos/delegated/DelegatedExtendedBolusDao.kt b/database/impl/src/main/java/info/nightscout/database/impl/daos/delegated/DelegatedExtendedBolusDao.kt index 76e89815dd..f650e3588e 100644 --- a/database/impl/src/main/java/info/nightscout/database/impl/daos/delegated/DelegatedExtendedBolusDao.kt +++ b/database/impl/src/main/java/info/nightscout/database/impl/daos/delegated/DelegatedExtendedBolusDao.kt @@ -4,7 +4,7 @@ import info.nightscout.database.impl.daos.ExtendedBolusDao import info.nightscout.database.entities.ExtendedBolus import info.nightscout.database.entities.interfaces.DBEntry -internal class DelegatedExtendedExtendedBolusDao(changes: MutableList, private val dao: ExtendedBolusDao) : DelegatedDao(changes), ExtendedBolusDao by dao { +internal class DelegatedExtendedBolusDao(changes: MutableList, private val dao: ExtendedBolusDao) : DelegatedDao(changes), ExtendedBolusDao by dao { override fun insertNewEntry(entry: ExtendedBolus): Long { changes.add(entry) diff --git a/database/impl/src/main/java/info/nightscout/database/impl/transactions/InvalidateTemporaryBasalTransactionWithPumpId.kt b/database/impl/src/main/java/info/nightscout/database/impl/transactions/InvalidateTemporaryBasalTransactionWithPumpId.kt index d4ed06050e..d39f5caf8e 100644 --- a/database/impl/src/main/java/info/nightscout/database/impl/transactions/InvalidateTemporaryBasalTransactionWithPumpId.kt +++ b/database/impl/src/main/java/info/nightscout/database/impl/transactions/InvalidateTemporaryBasalTransactionWithPumpId.kt @@ -3,9 +3,7 @@ package info.nightscout.database.impl.transactions import info.nightscout.database.entities.TemporaryBasal import info.nightscout.database.entities.embedments.InterfaceIDs -class InvalidateTemporaryBasalTransactionWithPumpId(val pumpId: Long, val pumpType: InterfaceIDs.PumpType, val -pumpSerial: -String) : +class InvalidateTemporaryBasalTransactionWithPumpId(val pumpId: Long, val pumpType: InterfaceIDs.PumpType, val pumpSerial: String) : Transaction() { override fun run(): TransactionResult {