refactor: moved to a package by feature structure (#3)

monta-app · May 6, 2024 · 9035965 · 9035965
1 parent 0fa2eda
commit 9035965
Show file tree

Hide file tree

Showing 69 changed files with 261 additions and 245 deletions.
diff --git a/v16/build.gradle.kts b/v16/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
     id("com.google.devtools.ksp")
 }
 
-group = "com.monta.ocpp.emulator.v16"
+group = "com.monta.ocpp.emulator"
 version = "2.3.1"
 
 kotlin {
@@ -108,7 +108,7 @@ compose.desktop {
             configurationFiles.from(project.file("compose-desktop.pro"))
         }
 
-        mainClass = "com.monta.ocpp.emulator.v16.AppKt"
+        mainClass = "com.monta.ocpp.emulator.AppKt"
 
         nativeDistributions {
             modules("java.naming", "java.instrument", "java.management", "java.sql", "jdk.unsupported")

diff --git a/...kotlin/com/monta/ocpp/emulator/v16/App.kt → ...ain/kotlin/com/monta/ocpp/emulator/App.kt b/...kotlin/com/monta/ocpp/emulator/v16/App.kt → ...ain/kotlin/com/monta/ocpp/emulator/App.kt
@@ -1,13 +1,11 @@
-package com.monta.ocpp.emulator.v16
+package com.monta.ocpp.emulator
 
 import androidx.compose.ui.window.application
-import com.monta.ocpp.emulator.CommonKoinModule
 import com.monta.ocpp.emulator.common.util.injectAnywhere
+import com.monta.ocpp.emulator.interceptor.view.EditMessageWindow
+import com.monta.ocpp.emulator.interceptor.view.SendMessageWindow
 import com.monta.ocpp.emulator.user.AnalyticsHelper
-import com.monta.ocpp.emulator.v16.service.ocpp.connection.ConnectionManager
-import com.monta.ocpp.emulator.v16.view.MainWindow
-import com.monta.ocpp.emulator.v16.view.interceptor.EditMessageWindow
-import com.monta.ocpp.emulator.v16.view.interceptor.SendMessageWindow
+import com.monta.ocpp.emulator.v16.connection.ConnectionManager
 import kotlinx.coroutines.runBlocking
 import mu.KotlinLogging
 import org.koin.core.logger.Level

diff --git a/...com/monta/ocpp/emulator/v16/MainModule.kt → ...lin/com/monta/ocpp/emulator/MainModule.kt b/...com/monta/ocpp/emulator/v16/MainModule.kt → ...lin/com/monta/ocpp/emulator/MainModule.kt
@@ -1,10 +1,10 @@
-package com.monta.ocpp.emulator.v16
+package com.monta.ocpp.emulator
 
 import com.monta.library.ocpp.common.session.OcppSessionRepository
 import com.monta.library.ocpp.common.transport.OcppSettings
 import com.monta.library.ocpp.v16.client.OcppClientV16Builder
-import com.monta.ocpp.emulator.v16.service.interceptor.MessageInterceptor
-import com.monta.ocpp.emulator.v16.service.ocpp.profile.OcppClientEventsHandler
+import com.monta.ocpp.emulator.interceptor.MessageInterceptor
+import com.monta.ocpp.emulator.v16.profile.OcppClientEventsHandler
 import org.koin.dsl.module
 
 object MainModule {

diff --git a/...onta/ocpp/emulator/v16/view/MainWindow.kt → ...lin/com/monta/ocpp/emulator/MainWindow.kt b/...onta/ocpp/emulator/v16/view/MainWindow.kt → ...lin/com/monta/ocpp/emulator/MainWindow.kt
@@ -1,4 +1,4 @@
-package com.monta.ocpp.emulator.v16.view
+package com.monta.ocpp.emulator
 
 import androidx.compose.desktop.ui.tooling.preview.Preview
 import androidx.compose.material.MaterialTheme
@@ -9,14 +9,15 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.ApplicationScope
 import androidx.compose.ui.window.WindowPosition
 import androidx.compose.ui.window.rememberWindowState
+import com.monta.ocpp.emulator.chargepoint.view.createchargepoint.CreateChargePointPage
+import com.monta.ocpp.emulator.chargepoint.view.screens.ChargePointPage
+import com.monta.ocpp.emulator.chargepoint.view.screens.ChargePointsScreen
 import com.monta.ocpp.emulator.common.BaseMontaWindow
 import com.monta.ocpp.emulator.common.util.injectAnywhere
+import com.monta.ocpp.emulator.common.view.NavigationViewModel
 import com.monta.ocpp.emulator.theme.AppThemeViewModel
 import com.monta.ocpp.emulator.update.view.UpdateDialog
-import com.monta.ocpp.emulator.v16.view.chargepoint.ChargePointPage
-import com.monta.ocpp.emulator.v16.view.chargepoints.ChargePointsScreen
-import com.monta.ocpp.emulator.v16.view.createchargepoint.CreateChargePointPage
-import com.monta.ocpp.emulator.v16.view.vehicle.VehicleScreen
+import com.monta.ocpp.emulator.vehicle.view.VehicleScreen
 
 @Preview
 @Composable

diff --git a/...onta/ocpp/emulator/v16/MontaKoinModule.kt → ...om/monta/ocpp/emulator/MontaKoinModule.kt b/...onta/ocpp/emulator/v16/MontaKoinModule.kt → ...om/monta/ocpp/emulator/MontaKoinModule.kt
@@ -1,4 +1,4 @@
-package com.monta.ocpp.emulator.v16
+package com.monta.ocpp.emulator
 
 import org.koin.core.annotation.ComponentScan
 import org.koin.core.annotation.Module

diff --git a/...p/emulator/v16/data/entity/ChargePoint.kt → ...mulator/chargepoint/entity/ChargePoint.kt b/...p/emulator/v16/data/entity/ChargePoint.kt → ...mulator/chargepoint/entity/ChargePoint.kt
@@ -1,20 +1,24 @@
-package com.monta.ocpp.emulator.v16.data.entity
+package com.monta.ocpp.emulator.chargepoint.entity
 
 import com.monta.library.ocpp.common.session.OcppSession
 import com.monta.library.ocpp.v16.core.ChargePointErrorCode
 import com.monta.library.ocpp.v16.core.ChargePointStatus
 import com.monta.library.ocpp.v16.core.DataTransferRequest
 import com.monta.library.ocpp.v16.firmware.DiagnosticsStatusNotificationStatus
 import com.monta.library.ocpp.v16.firmware.FirmwareStatusNotificationStatus
+import com.monta.ocpp.emulator.chargepoint.model.ChargePointConfiguration
+import com.monta.ocpp.emulator.chargepoint.model.ChargePointMode
+import com.monta.ocpp.emulator.chargepoint.model.LocalAuthList
+import com.monta.ocpp.emulator.chargepoint.model.OcppVersion
+import com.monta.ocpp.emulator.chargepointconnector.entity.ChargePointConnectorDAO
+import com.monta.ocpp.emulator.chargepointconnector.entity.ChargePointConnectorTable
+import com.monta.ocpp.emulator.chargepointtransaction.entity.ChargePointTransaction
+import com.monta.ocpp.emulator.chargepointtransaction.entity.ChargePointTransactionDAO
+import com.monta.ocpp.emulator.common.idValue
 import com.monta.ocpp.emulator.common.util.MontaSerialization
 import com.monta.ocpp.emulator.common.util.json
 import com.monta.ocpp.emulator.common.util.randomString
 import com.monta.ocpp.emulator.logger.Loggable
-import com.monta.ocpp.emulator.v16.data.model.ChargePointConfiguration
-import com.monta.ocpp.emulator.v16.data.model.ChargePointMode
-import com.monta.ocpp.emulator.v16.data.model.LocalAuthList
-import com.monta.ocpp.emulator.v16.data.model.OcppVersion
-import com.monta.ocpp.emulator.v16.data.util.idValue
 import org.jetbrains.exposed.dao.LongEntity
 import org.jetbrains.exposed.dao.LongEntityClass
 import org.jetbrains.exposed.dao.id.EntityID

diff --git a/.../v16/data/entity/PreviousMessagesTable.kt → ...argepoint/entity/PreviousMessagesTable.kt b/.../v16/data/entity/PreviousMessagesTable.kt → ...argepoint/entity/PreviousMessagesTable.kt
@@ -1,4 +1,4 @@
-package com.monta.ocpp.emulator.v16.data.entity
+package com.monta.ocpp.emulator.chargepoint.entity
 
 import org.jetbrains.exposed.dao.LongEntity
 import org.jetbrains.exposed.dao.LongEntityClass

diff --git a/...exception/ChargePointNotFoundException.kt → ...exception/ChargePointNotFoundException.kt b/...exception/ChargePointNotFoundException.kt → ...exception/ChargePointNotFoundException.kt
@@ -1,3 +1,3 @@
-package com.monta.ocpp.emulator.v16.data.exception
+package com.monta.ocpp.emulator.chargepoint.exception
 
 class ChargePointNotFoundException : Exception("Charge point not found")
diff --git a/...16/data/model/ChargePointConfiguration.kt → ...gepoint/model/ChargePointConfiguration.kt b/...16/data/model/ChargePointConfiguration.kt → ...gepoint/model/ChargePointConfiguration.kt
@@ -1,4 +1,4 @@
-package com.monta.ocpp.emulator.v16.data.model
+package com.monta.ocpp.emulator.chargepoint.model
 
 import com.monta.ocpp.emulator.eichrecht.EichrechtKey
 

diff --git a/...mulator/v16/data/model/ChargePointMode.kt → ...ator/chargepoint/model/ChargePointMode.kt b/...mulator/v16/data/model/ChargePointMode.kt → ...ator/chargepoint/model/ChargePointMode.kt
@@ -1,4 +1,4 @@
-package com.monta.ocpp.emulator.v16.data.model
+package com.monta.ocpp.emulator.chargepoint.model
 
 enum class ChargePointMode {
     // Charge point will run automatically

diff --git a/.../emulator/v16/data/model/LocalAuthList.kt → ...ulator/chargepoint/model/LocalAuthList.kt b/.../emulator/v16/data/model/LocalAuthList.kt → ...ulator/chargepoint/model/LocalAuthList.kt
@@ -1,4 +1,4 @@
-package com.monta.ocpp.emulator.v16.data.model
+package com.monta.ocpp.emulator.chargepoint.model
 
 data class LocalAuthList(
     var version: Int = 1,

diff --git a/...pp/emulator/v16/data/model/OcppVersion.kt → ...emulator/chargepoint/model/OcppVersion.kt b/...pp/emulator/v16/data/model/OcppVersion.kt → ...emulator/chargepoint/model/OcppVersion.kt
@@ -1,4 +1,4 @@
-package com.monta.ocpp.emulator.v16.data.model
+package com.monta.ocpp.emulator.chargepoint.model
 
 enum class OcppVersion(val version: String) {
     V16("OCPP-1.6"),

diff --git a/.../data/repository/ChargePointRepository.kt → ...point/repository/ChargePointRepository.kt b/.../data/repository/ChargePointRepository.kt → ...point/repository/ChargePointRepository.kt
@@ -1,8 +1,8 @@
-package com.monta.ocpp.emulator.v16.data.repository
+package com.monta.ocpp.emulator.chargepoint.repository
 
-import com.monta.ocpp.emulator.v16.data.entity.ChargePointDAO
-import com.monta.ocpp.emulator.v16.data.entity.ChargePointTable
-import com.monta.ocpp.emulator.v16.data.util.createDatabaseListener
+import com.monta.ocpp.emulator.chargepoint.entity.ChargePointDAO
+import com.monta.ocpp.emulator.chargepoint.entity.ChargePointTable
+import com.monta.ocpp.emulator.common.createDatabaseListener
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
 import org.jetbrains.exposed.sql.transactions.transaction

diff --git a/...or/v16/data/service/ChargePointService.kt → ...chargepoint/service/ChargePointService.kt b/...or/v16/data/service/ChargePointService.kt → ...chargepoint/service/ChargePointService.kt
@@ -1,8 +1,8 @@
-package com.monta.ocpp.emulator.v16.data.service
+package com.monta.ocpp.emulator.chargepoint.service
 
-import com.monta.ocpp.emulator.v16.data.entity.ChargePointDAO
-import com.monta.ocpp.emulator.v16.data.exception.ChargePointNotFoundException
-import com.monta.ocpp.emulator.v16.data.repository.ChargePointRepository
+import com.monta.ocpp.emulator.chargepoint.entity.ChargePointDAO
+import com.monta.ocpp.emulator.chargepoint.exception.ChargePointNotFoundException
+import com.monta.ocpp.emulator.chargepoint.repository.ChargePointRepository
 import org.jetbrains.exposed.sql.transactions.transaction
 import org.koin.core.annotation.Singleton
 

diff --git a/...6/data/service/PreviousMessagesService.kt → ...epoint/service/PreviousMessagesService.kt b/...6/data/service/PreviousMessagesService.kt → ...epoint/service/PreviousMessagesService.kt
@@ -1,7 +1,7 @@
-package com.monta.ocpp.emulator.v16.data.service
+package com.monta.ocpp.emulator.chargepoint.service
 
-import com.monta.ocpp.emulator.v16.data.entity.PreviousMessagesDAO
-import com.monta.ocpp.emulator.v16.data.entity.PreviousMessagesTable
+import com.monta.ocpp.emulator.chargepoint.entity.PreviousMessagesDAO
+import com.monta.ocpp.emulator.chargepoint.entity.PreviousMessagesTable
 import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
 import org.jetbrains.exposed.sql.and
 import org.jetbrains.exposed.sql.deleteWhere

diff --git a/...16/view/chargepoint/AuthorizeComponent.kt → ...int/view/components/AuthorizeComponent.kt b/...16/view/chargepoint/AuthorizeComponent.kt → ...int/view/components/AuthorizeComponent.kt
@@ -1,4 +1,4 @@
-package com.monta.ocpp.emulator.v16.view.chargepoint
+package com.monta.ocpp.emulator.chargepoint.view.components
 
 import androidx.compose.foundation.layout.BoxScope
 import androidx.compose.foundation.layout.Column
@@ -18,11 +18,11 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
+import com.monta.ocpp.emulator.chargepointconnector.entity.ChargePointConnectorDAO
 import com.monta.ocpp.emulator.common.components.RfidButton
 import com.monta.ocpp.emulator.common.util.injectAnywhere
 import com.monta.ocpp.emulator.common.util.launchThread
-import com.monta.ocpp.emulator.v16.data.entity.ChargePointConnectorDAO
-import com.monta.ocpp.emulator.v16.service.ocpp.ChargePointManager
+import com.monta.ocpp.emulator.v16.ChargePointManager
 
 @Composable
 fun BoxScope.authorizeComponent(

diff --git a/...chargepoints/component/ChargePointCard.kt → ...epoint/view/components/ChargePointCard.kt b/...chargepoints/component/ChargePointCard.kt → ...epoint/view/components/ChargePointCard.kt
@@ -1,4 +1,4 @@
-package com.monta.ocpp.emulator.v16.view.chargepoints.component
+package com.monta.ocpp.emulator.chargepoint.view.components
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -22,18 +22,18 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import com.monta.ocpp.emulator.chargepoint.entity.ChargePointDAO
 import com.monta.ocpp.emulator.common.components.MontaIcon
 import com.monta.ocpp.emulator.common.components.MontaStateIcon
 import com.monta.ocpp.emulator.common.components.TextTooltip
 import com.monta.ocpp.emulator.common.components.getCardStyle
 import com.monta.ocpp.emulator.common.components.toKilowattString
+import com.monta.ocpp.emulator.common.idValue
 import com.monta.ocpp.emulator.common.model.UrlChoice
 import com.monta.ocpp.emulator.common.util.injectAnywhere
 import com.monta.ocpp.emulator.common.util.launchThread
-import com.monta.ocpp.emulator.v16.data.entity.ChargePointDAO
-import com.monta.ocpp.emulator.v16.data.util.idValue
-import com.monta.ocpp.emulator.v16.service.ocpp.connection.ConnectionManager
-import com.monta.ocpp.emulator.v16.view.NavigationViewModel
+import com.monta.ocpp.emulator.common.view.NavigationViewModel
+import com.monta.ocpp.emulator.v16.connection.ConnectionManager
 import org.jetbrains.exposed.sql.transactions.transaction
 
 @OptIn(ExperimentalMaterialApi::class)

diff --git a/.../view/chargepoint/ChargePointComponent.kt → ...t/view/components/ChargePointComponent.kt b/.../view/chargepoint/ChargePointComponent.kt → ...t/view/components/ChargePointComponent.kt
@@ -1,4 +1,4 @@
-package com.monta.ocpp.emulator.v16.view.chargepoint
+package com.monta.ocpp.emulator.chargepoint.view.components
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
@@ -20,12 +20,12 @@ import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.unit.dp
 import com.monta.library.ocpp.v16.core.ChargePointStatus
+import com.monta.ocpp.emulator.chargepoint.entity.ChargePointDAO
+import com.monta.ocpp.emulator.chargepoint.view.components.security.securityEventComponent
 import com.monta.ocpp.emulator.common.components.getButtonStateColor
 import com.monta.ocpp.emulator.common.components.getCardStyle
 import com.monta.ocpp.emulator.common.components.toReadable
-import com.monta.ocpp.emulator.v16.data.entity.ChargePointDAO
-import com.monta.ocpp.emulator.v16.service.ocpp.setStatus
-import com.monta.ocpp.emulator.v16.view.chargepoint.security.securityEventComponent
+import com.monta.ocpp.emulator.v16.setStatus
 import kotlinx.coroutines.launch
 
 @Composable

diff --git a/...hargepoint/ChargePointDisplayComponent.kt → ...components/ChargePointDisplayComponent.kt b/...hargepoint/ChargePointDisplayComponent.kt → ...components/ChargePointDisplayComponent.kt
@@ -1,4 +1,4 @@
-package com.monta.ocpp.emulator.v16.view.chargepoint
+package com.monta.ocpp.emulator.chargepoint.view.components
 
 import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Column
@@ -13,7 +13,7 @@ import androidx.compose.ui.draw.shadow
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
-import com.monta.ocpp.emulator.v16.data.entity.ChargePointDAO
+import com.monta.ocpp.emulator.chargepoint.entity.ChargePointDAO
 
 @Composable
 fun chargePointDisplayComponent(

diff --git a/...16/view/chargepoint/ChargePointLogView.kt → ...int/view/components/ChargePointLogView.kt b/...16/view/chargepoint/ChargePointLogView.kt → ...int/view/components/ChargePointLogView.kt
@@ -1,4 +1,4 @@
-package com.monta.ocpp.emulator.v16.view.chargepoint
+package com.monta.ocpp.emulator.chargepoint.view.components
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -18,9 +18,9 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import com.monta.ocpp.emulator.common.components.getCardStyle
 import com.monta.ocpp.emulator.common.util.injectAnywhere
+import com.monta.ocpp.emulator.common.view.NavigationViewModel
 import com.monta.ocpp.emulator.logger.ChargePointLogger
 import com.monta.ocpp.emulator.theme.AppThemeViewModel
-import com.monta.ocpp.emulator.v16.view.NavigationViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext

diff --git a/...or/v16/view/chargepoint/pbm/PbmButtons.kt → ...gepoint/view/components/pbm/PbmButtons.kt b/...or/v16/view/chargepoint/pbm/PbmButtons.kt → ...gepoint/view/components/pbm/PbmButtons.kt
@@ -1,4 +1,4 @@
-package com.monta.ocpp.emulator.v16.view.chargepoint.pbm
+package com.monta.ocpp.emulator.chargepoint.view.components.pbm
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row

diff --git a/...tor/v16/view/chargepoint/pbm/PbmDialog.kt → ...rgepoint/view/components/pbm/PbmDialog.kt b/...tor/v16/view/chargepoint/pbm/PbmDialog.kt → ...rgepoint/view/components/pbm/PbmDialog.kt
@@ -1,4 +1,4 @@
-package com.monta.ocpp.emulator.v16.view.chargepoint.pbm
+package com.monta.ocpp.emulator.chargepoint.view.components.pbm
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Box
@@ -19,7 +19,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import com.monta.ocpp.emulator.v16.data.entity.ChargePointDAO
+import com.monta.ocpp.emulator.chargepoint.entity.ChargePointDAO
 import kotlinx.coroutines.launch
 
 @Composable

diff --git a/...or/v16/view/chargepoint/pbm/PbmService.kt → ...gepoint/view/components/pbm/PbmService.kt b/...or/v16/view/chargepoint/pbm/PbmService.kt → ...gepoint/view/components/pbm/PbmService.kt
@@ -1,8 +1,8 @@
-package com.monta.ocpp.emulator.v16.view.chargepoint.pbm
+package com.monta.ocpp.emulator.chargepoint.view.components.pbm
 
 import androidx.compose.ui.graphics.ImageBitmap
 import androidx.compose.ui.graphics.toComposeImageBitmap
-import com.monta.ocpp.emulator.v16.data.entity.ChargePointDAO
+import com.monta.ocpp.emulator.chargepoint.entity.ChargePointDAO
 import io.nayuki.qrcodegen.QrCode
 import kotlinx.coroutines.flow.MutableStateFlow
 import java.awt.image.BufferedImage

diff --git a/...iew/chargepoint/security/SecurityEvent.kt → ...view/components/security/SecurityEvent.kt b/...iew/chargepoint/security/SecurityEvent.kt → ...view/components/security/SecurityEvent.kt
@@ -1,4 +1,4 @@
-package com.monta.ocpp.emulator.v16.view.chargepoint.security
+package com.monta.ocpp.emulator.chargepoint.view.components.security
 
 enum class SecurityEvent(
     val description: String

diff --git a/...epoint/security/SecurityEventComponent.kt → ...onents/security/SecurityEventComponent.kt b/...epoint/security/SecurityEventComponent.kt → ...onents/security/SecurityEventComponent.kt
@@ -1,4 +1,4 @@
-package com.monta.ocpp.emulator.v16.view.chargepoint.security
+package com.monta.ocpp.emulator.chargepoint.view.components.security
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -15,11 +15,11 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
+import com.monta.ocpp.emulator.chargepoint.entity.ChargePointDAO
 import com.monta.ocpp.emulator.common.components.Spinner
 import com.monta.ocpp.emulator.common.util.injectAnywhere
 import com.monta.ocpp.emulator.common.util.launchThread
-import com.monta.ocpp.emulator.v16.data.entity.ChargePointDAO
-import com.monta.ocpp.emulator.v16.service.ocpp.ChargePointManager
+import com.monta.ocpp.emulator.v16.ChargePointManager
 
 @Composable
 fun ColumnScope.securityEventComponent(

diff --git a/...view/createchargepoint/ChargePointForm.kt → ...view/createchargepoint/ChargePointForm.kt b/...view/createchargepoint/ChargePointForm.kt → ...view/createchargepoint/ChargePointForm.kt
@@ -1,4 +1,4 @@
-package com.monta.ocpp.emulator.v16.view.createchargepoint
+package com.monta.ocpp.emulator.chargepoint.view.createchargepoint
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -24,6 +24,10 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
+import com.monta.ocpp.emulator.chargepoint.entity.ChargePointDAO
+import com.monta.ocpp.emulator.chargepoint.entity.ChargePointTable
+import com.monta.ocpp.emulator.chargepoint.model.OcppVersion
+import com.monta.ocpp.emulator.chargepoint.service.ChargePointService
 import com.monta.ocpp.emulator.common.components.FormInput
 import com.monta.ocpp.emulator.common.components.LabelledCheckBox
 import com.monta.ocpp.emulator.common.components.MontaIcon
@@ -33,17 +37,16 @@ import com.monta.ocpp.emulator.common.components.getButtonStateColor
 import com.monta.ocpp.emulator.common.components.getCardStyle
 import com.monta.ocpp.emulator.common.model.UrlChoice
 import com.monta.ocpp.emulator.common.util.injectAnywhere
-import com.monta.ocpp.emulator.v16.data.entity.ChargePointDAO
-import com.monta.ocpp.emulator.v16.data.entity.ChargePointTable
-import com.monta.ocpp.emulator.v16.data.model.OcppVersion
-import com.monta.ocpp.emulator.v16.data.service.ChargePointService
-import com.monta.ocpp.emulator.v16.view.NavigationViewModel
+import com.monta.ocpp.emulator.common.view.NavigationViewModel
 import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
 import org.jetbrains.exposed.sql.transactions.transaction
 import org.koin.core.annotation.Factory
 
 @Composable
-fun ChargePointForm(viewModel: ChargePointFormViewModel, chargePoint: ChargePointDAO?) {
+fun ChargePointForm(
+    viewModel: ChargePointFormViewModel,
+    chargePoint: ChargePointDAO?
+) {
     chargePoint?.let {
         if (!viewModel.initialized) {
             viewModel.form.updateFromDAO(it)
@@ -327,7 +330,9 @@ class ChargePointFormViewModel {
         ) {
             formErrors["identity"] = "Identity already in use"
             hasErrors = true
-        } else if (form.urlChoice == UrlChoice.Production && !form.chargePointIdentity.trim().uppercase().startsWith("MEM_")) {
+        } else if (form.urlChoice == UrlChoice.Production && !form.chargePointIdentity.trim().uppercase()
+                .startsWith("MEM_")
+        ) {
             formErrors["identity"] = "On production identity must begin with MEM_"
             hasErrors = true
         } else {