Merge pull request OSGP#51 from OSGP/feature/FDP-2600-lichte-refactoring

FDP-2600: small readability improvement
lf-energy-projects-renovation-state · Sep 30, 2024 · f413c4d · f413c4d
2 parents 21d6479 + f61ba25
commit f413c4d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/...nts/firmware/src/main/kotlin/org/gxf/crestdeviceservice/firmware/entity/FirmwarePacket.kt b/...nts/firmware/src/main/kotlin/org/gxf/crestdeviceservice/firmware/entity/FirmwarePacket.kt
@@ -10,8 +10,4 @@ import jakarta.persistence.ManyToOne
 
 @Entity
 @IdClass(FirmwarePacketCompositeKey::class)
-class FirmwarePacket(
-    @ManyToOne @Id val firmware: Firmware,
-    @Id val packetNumber: Int,
-    val packet: String
-)
+class FirmwarePacket(@ManyToOne @Id val firmware: Firmware, @Id val packetNumber: Int, val packet: String)
diff --git a/...rc/main/kotlin/org/gxf/crestdeviceservice/firmware/repository/FirmwarePacketRepository.kt b/...rc/main/kotlin/org/gxf/crestdeviceservice/firmware/repository/FirmwarePacketRepository.kt
@@ -8,5 +8,4 @@ import org.gxf.crestdeviceservice.firmware.entity.FirmwarePacketCompositeKey
 import org.springframework.data.repository.CrudRepository
 import org.springframework.stereotype.Repository
 
-@Repository
-interface FirmwarePacketRepository : CrudRepository<FirmwarePacket, FirmwarePacketCompositeKey>
+@Repository interface FirmwarePacketRepository : CrudRepository<FirmwarePacket, FirmwarePacketCompositeKey>
diff --git a/components/psk/src/main/kotlin/org/gxf/crestdeviceservice/psk/service/PskService.kt b/components/psk/src/main/kotlin/org/gxf/crestdeviceservice/psk/service/PskService.kt
@@ -75,10 +75,12 @@ class PskService(private val pskRepository: PskRepository, private val pskConfig
             PreSharedKey(deviceId, newVersion, Instant.now(), newKey, previousPSK.secret, PreSharedKeyStatus.READY))
     }
 
-    private fun generatePsk(): String =
-        secureRandom.ints(KEY_LENGTH, 0, ALLOWED_CHARACTERS.length).toArray().fold("") { acc, next ->
-            acc + ALLOWED_CHARACTERS[next]
-        }
+    private fun generatePsk() =
+        secureRandom
+            .ints(KEY_LENGTH, 0, ALLOWED_CHARACTERS.length)
+            .toArray()
+            .map { ALLOWED_CHARACTERS[it] }
+            .joinToString("")
 
     fun setPskToPendingForDevice(deviceId: String): PreSharedKey {
         val psk = getCurrentReadyPsk(deviceId) ?: throw NoExistingPskException("There is no new key ready to be set")