FDP-2359: Minor fixes

Signed-off-by: Jasper Kamerling <[email protected]>
lf-energy-projects-renovation-state · Jul 30, 2024 · 08a6878 · 08a6878
1 parent fd9f80a
commit 08a6878
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/...er/IncomingDeviceCredentialsController.kt → ...umer/IncomingDeviceCredentialsConsumer.kt b/...er/IncomingDeviceCredentialsController.kt → ...umer/IncomingDeviceCredentialsConsumer.kt
@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Contributors to the GXF project
 //
 // SPDX-License-Identifier: Apache-2.0
-package org.gxf.crestdeviceservice.controller
+package org.gxf.crestdeviceservice.consumer
 
 import com.alliander.sng.DeviceCredentials
 import io.github.oshai.kotlinlogging.KotlinLogging
@@ -11,7 +11,7 @@ import org.springframework.kafka.annotation.KafkaListener
 import org.springframework.stereotype.Service
 
 @Service
-class IncomingDeviceCredentialsController(
+class IncomingDeviceCredentialsConsumer(
     private val pskService: PskService,
     private val pskDecryptionService: PskDecryptionService
 ) {

diff --git a/...crestdeviceservice/service/PskErrorUrc.kt → ...f/crestdeviceservice/model/PskErrorUrc.kt b/...crestdeviceservice/service/PskErrorUrc.kt → ...f/crestdeviceservice/model/PskErrorUrc.kt
@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Contributors to the GXF project
 //
 // SPDX-License-Identifier: Apache-2.0
-package org.gxf.crestdeviceservice.service
+package org.gxf.crestdeviceservice.model
 
 enum class PskErrorUrc(val code: String, val message: String) {
     PSK_EQER("PSK:EQER", "Set PSK does not equal earlier PSK"),

diff --git a/application/src/main/kotlin/org/gxf/crestdeviceservice/service/UrcService.kt b/application/src/main/kotlin/org/gxf/crestdeviceservice/service/UrcService.kt
@@ -5,6 +5,7 @@ package org.gxf.crestdeviceservice.service
 
 import com.fasterxml.jackson.databind.JsonNode
 import io.github.oshai.kotlinlogging.KotlinLogging
+import org.gxf.crestdeviceservice.model.PskErrorUrc
 import org.gxf.crestdeviceservice.psk.exception.NoExistingPskException
 import org.gxf.crestdeviceservice.psk.service.PskService
 import org.springframework.stereotype.Service

diff --git a/...ncomingDeviceCredentialsControllerTest.kt → .../IncomingDeviceCredentialsConsumerTest.kt b/...ncomingDeviceCredentialsControllerTest.kt → .../IncomingDeviceCredentialsConsumerTest.kt
@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Contributors to the GXF project
 //
 // SPDX-License-Identifier: Apache-2.0
-package org.gxf.crestdeviceservice.controller
+package org.gxf.crestdeviceservice.consumer
 
 import com.alliander.sng.DeviceCredentials
 import org.gxf.crestdeviceservice.psk.service.PskDecryptionService
@@ -11,11 +11,11 @@ import org.mockito.kotlin.mock
 import org.mockito.kotlin.verify
 import org.mockito.kotlin.whenever
 
-class IncomingDeviceCredentialsControllerTest {
+class IncomingDeviceCredentialsConsumerTest {
     private val pskService = mock<PskService>()
     private val pskDecryptionService = mock<PskDecryptionService>()
-    private val incomingDeviceCredentialsController =
-        IncomingDeviceCredentialsController(pskService, pskDecryptionService)
+    private val incomingDeviceCredentialsConsumer =
+        IncomingDeviceCredentialsConsumer(pskService, pskDecryptionService)
 
     @Test
     fun handleIncomingDeviceCredentials() {
@@ -31,7 +31,7 @@ class IncomingDeviceCredentialsControllerTest {
         whenever(pskDecryptionService.decryptSecret(secret, keyRef)).thenReturn(decryptedSecret)
         whenever(pskService.changeInitialPsk()).thenReturn(true)
 
-        incomingDeviceCredentialsController.handleIncomingDeviceCredentials(deviceCredentials)
+        incomingDeviceCredentialsConsumer.handleIncomingDeviceCredentials(deviceCredentials)
 
         verify(pskService).setInitialKeyForIdentity(imei, decryptedPsk, decryptedSecret)
         verify(pskService).generateNewReadyKeyForIdentity(imei)