Merge pull request OSGP#89 from OSGP/dependabot/gradle/com.diffplug.s…

…potless-7.0.1

Bump com.diffplug.spotless from 6.25.0 to 7.0.1

application/src/integrationTest/kotlin/org/gxf/crestdeviceservice/CoapMessageHandlingTest.kt

@@ -41,7 +41,7 @@ import org.springframework.test.annotation.DirtiesContext
             "\${kafka.consumers.command.topic}",
             "\${kafka.consumers.pre-shared-key.topic}",
             "\${kafka.producers.command-feedback.topic}",
-            "\${kafka.producers.device-message.topic}"
+            "\${kafka.producers.device-message.topic}",
         ]
 )
 @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
@@ -89,7 +89,7 @@ class CoapMessageHandlingTest {
                 Instant.now(),
                 Command.CommandType.PSK,
                 null,
-                Command.CommandStatus.PENDING
+                Command.CommandStatus.PENDING,
             )
         )
         commandRepository.save(
@@ -100,7 +100,7 @@ class CoapMessageHandlingTest {
                 Instant.now(),
                 Command.CommandType.PSK_SET,
                 null,
-                Command.CommandStatus.PENDING
+                Command.CommandStatus.PENDING,
             )
         )
 
@@ -124,7 +124,7 @@ class CoapMessageHandlingTest {
                 Instant.now(),
                 Command.CommandType.PSK,
                 null,
-                Command.CommandStatus.IN_PROGRESS
+                Command.CommandStatus.IN_PROGRESS,
             )
         )
         commandRepository.save(
@@ -135,7 +135,7 @@ class CoapMessageHandlingTest {
                 Instant.now(),
                 Command.CommandType.PSK_SET,
                 null,
-                Command.CommandStatus.IN_PROGRESS
+                Command.CommandStatus.IN_PROGRESS,
             )
         )
 
@@ -164,7 +164,7 @@ class CoapMessageHandlingTest {
                 Instant.now(),
                 Command.CommandType.PSK,
                 null,
-                Command.CommandStatus.IN_PROGRESS
+                Command.CommandStatus.IN_PROGRESS,
             )
         )
         commandRepository.save(
@@ -175,7 +175,7 @@ class CoapMessageHandlingTest {
                 Instant.now(),
                 Command.CommandType.PSK_SET,
                 null,
-                Command.CommandStatus.IN_PROGRESS
+                Command.CommandStatus.IN_PROGRESS,
             )
         )
 
@@ -204,7 +204,7 @@ class CoapMessageHandlingTest {
                 Instant.now(),
                 Command.CommandType.REBOOT,
                 null,
-                Command.CommandStatus.PENDING
+                Command.CommandStatus.PENDING,
             )
         commandRepository.save(pendingCommand)
 
@@ -222,7 +222,7 @@ class CoapMessageHandlingTest {
             val savedCommand =
                 commandRepository.findFirstByDeviceIdAndStatusOrderByTimestampIssuedAsc(
                     DEVICE_ID,
-                    Command.CommandStatus.IN_PROGRESS
+                    Command.CommandStatus.IN_PROGRESS,
                 )
 
             assertThat(savedCommand).isNotNull()
@@ -244,7 +244,7 @@ class CoapMessageHandlingTest {
                 Instant.now(),
                 Command.CommandType.REBOOT,
                 "reboot",
-                Command.CommandStatus.IN_PROGRESS
+                Command.CommandStatus.IN_PROGRESS,
             )
         commandRepository.save(commandInProgress)
 
@@ -261,7 +261,7 @@ class CoapMessageHandlingTest {
             val savedCommand =
                 commandRepository.findFirstByDeviceIdAndStatusOrderByTimestampIssuedAsc(
                     DEVICE_ID,
-                    Command.CommandStatus.SUCCESSFUL
+                    Command.CommandStatus.SUCCESSFUL,
                 )
 
             assertThat(savedCommand).isNotNull

application/src/integrationTest/kotlin/org/gxf/crestdeviceservice/DeviceCredentialsRetrievalTest.kt

@@ -24,9 +24,7 @@ import org.springframework.kafka.test.context.EmbeddedKafka
 import org.springframework.test.annotation.DirtiesContext
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
-@EmbeddedKafka(
-    topics = ["\${kafka.producers.device-message.topic}"],
-)
+@EmbeddedKafka(topics = ["\${kafka.producers.device-message.topic}"])
 @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
 class DeviceCredentialsRetrievalTest {
     companion object {

application/src/integrationTest/kotlin/org/gxf/crestdeviceservice/IntegrationTestHelper.kt

@@ -23,7 +23,7 @@ import org.springframework.util.ResourceUtils
 object IntegrationTestHelper {
     fun createKafkaConsumer(
         embeddedKafkaBroker: EmbeddedKafkaBroker,
-        topic: String
+        topic: String,
     ): Consumer<String, SpecificRecordBase> {
         val testProperties = KafkaTestUtils.consumerProps("testGroup", "true", embeddedKafkaBroker)
         val consumerFactory =
@@ -32,7 +32,7 @@ object IntegrationTestHelper {
                 StringDeserializer(),
                 AvroDeserializer(
                     listOf(DeviceMessage.getClassSchema(), CommandFeedback.getClassSchema(), Firmwares.getClassSchema())
-                )
+                ),
             )
         val consumer = consumerFactory.createConsumer()
         embeddedKafkaBroker.consumeFromAnEmbeddedTopic(consumer, topic)
@@ -57,7 +57,7 @@ object IntegrationTestHelper {
             ProducerConfig.LINGER_MS_CONFIG to 1,
             ProducerConfig.BUFFER_MEMORY_CONFIG to "33554432",
             ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG to StringSerializer::class.java,
-            ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG to AvroSerializer::class.java
+            ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG to AvroSerializer::class.java,
         )
     }
 

application/src/integrationTest/kotlin/org/gxf/crestdeviceservice/MakiCommandHandlingTest.kt

@@ -83,7 +83,7 @@ class MakiCommandHandlingTest {
             val savedCommand =
                 commandRepository.findFirstByDeviceIdAndStatusOrderByTimestampIssuedAsc(
                     DEVICE_ID,
-                    org.gxf.crestdeviceservice.command.entity.Command.CommandStatus.PENDING
+                    org.gxf.crestdeviceservice.command.entity.Command.CommandStatus.PENDING,
                 )
 
             assertThat(savedCommand).isNotNull

application/src/integrationTest/kotlin/org/gxf/crestdeviceservice/MessageHandlingTest.kt

@@ -24,9 +24,7 @@ import org.springframework.test.annotation.DirtiesContext
 import org.testcontainers.shaded.com.fasterxml.jackson.databind.ObjectMapper
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
-@EmbeddedKafka(
-    topics = ["\${kafka.producers.device-message.topic}"],
-)
+@EmbeddedKafka(topics = ["\${kafka.producers.device-message.topic}"])
 @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
 @EnableConfigurationProperties(KafkaProducerProperties::class)
 class MessageHandlingTest {

application/src/main/kotlin/org/gxf/crestdeviceservice/command/consumer/CommandConsumer.kt

@@ -18,7 +18,7 @@ import org.springframework.stereotype.Service
 class CommandConsumer(
     private val commandService: CommandService,
     private val commandFeedbackService: CommandFeedbackService,
-    private val pskService: PskService
+    private val pskService: PskService,
 ) {
     private val logger = KotlinLogging.logger {}
 

application/src/main/kotlin/org/gxf/crestdeviceservice/command/entity/Command.kt

@@ -55,6 +55,6 @@ class Command(
         IN_PROGRESS,
         SUCCESSFUL,
         ERROR,
-        CANCELLED
+        CANCELLED,
     }
 }

application/src/main/kotlin/org/gxf/crestdeviceservice/command/generator/FirmwareCommandGenerator.kt

@@ -8,9 +8,7 @@ import org.gxf.crestdeviceservice.firmware.service.FirmwareService
 import org.springframework.stereotype.Component
 
 @Component
-class FirmwareCommandGenerator(
-    private val firmwareService: FirmwareService,
-) : CommandGenerator {
+class FirmwareCommandGenerator(private val firmwareService: FirmwareService) : CommandGenerator {
     override fun generateCommandString(command: Command): String {
         requireNotNull(command.commandValue) { "commandValue should have a firmware name" }
         val deviceId = command.deviceId

application/src/main/kotlin/org/gxf/crestdeviceservice/command/mapper/CommandFeedbackMapper.kt

@@ -13,7 +13,7 @@ object CommandFeedbackMapper {
     fun commandEntityToCommandFeedback(
         command: Command,
         status: ExternalCommandStatus,
-        message: String
+        message: String,
     ): CommandFeedback =
         CommandFeedback.newBuilder()
             .setDeviceId(command.deviceId)
@@ -26,7 +26,7 @@ object CommandFeedbackMapper {
     fun externalCommandToCommandFeedback(
         command: ExternalCommand,
         status: ExternalCommandStatus,
-        message: String
+        message: String,
     ): CommandFeedback =
         CommandFeedback.newBuilder()
             .setDeviceId(command.deviceId)

application/src/main/kotlin/org/gxf/crestdeviceservice/command/mapper/CommandMapper.kt

@@ -18,7 +18,7 @@ object CommandMapper {
                 timestampIssued = externalCommand.timestamp,
                 type = commandNameToType(externalCommand.command),
                 status = status,
-                commandValue = externalCommand.value
+                commandValue = externalCommand.value,
             )
         } catch (exception: IllegalArgumentException) {
             throw CommandValidationException("Command unknown: ${externalCommand.command}")

application/src/main/kotlin/org/gxf/crestdeviceservice/command/repository/CommandRepository.kt

@@ -16,12 +16,12 @@ interface CommandRepository : CrudRepository<Command, UUID> {
 
     fun findAllByDeviceIdAndStatusOrderByTimestampIssuedAsc(
         deviceId: String,
-        status: Command.CommandStatus
+        status: Command.CommandStatus,
     ): List<Command>
 
     fun findAllByDeviceIdAndTypeAndStatusOrderByTimestampIssuedAsc(
         deviceId: String,
         type: Command.CommandType,
-        status: Command.CommandStatus
+        status: Command.CommandStatus,
     ): List<Command>
 }

application/src/main/kotlin/org/gxf/crestdeviceservice/command/resulthandler/CommandResultHandler.kt

@@ -13,7 +13,7 @@ import org.gxf.crestdeviceservice.model.ErrorUrc.Companion.getMessageFromCode
 
 abstract class CommandResultHandler(
     private val commandService: CommandService,
-    private val commandFeedbackService: CommandFeedbackService
+    private val commandFeedbackService: CommandFeedbackService,
 ) {
     private val logger = KotlinLogging.logger {}
 

application/src/main/kotlin/org/gxf/crestdeviceservice/command/resulthandler/FirmwareCommandResultHandler.kt

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Component
 @Component
 class FirmwareCommandResultHandler(
     val commandService: CommandService,
-    val commandFeedbackService: CommandFeedbackService
+    val commandFeedbackService: CommandFeedbackService,
 ) : CommandResultHandler(commandService, commandFeedbackService) {
 
     private val successUrc = "OTA:SUC"

application/src/main/kotlin/org/gxf/crestdeviceservice/command/resulthandler/PskSetCommandResultHandler.kt

@@ -16,7 +16,7 @@ import org.springframework.stereotype.Component
 class PskSetCommandResultHandler(
     val pskService: PskService,
     val commandService: CommandService,
-    val commandFeedbackService: CommandFeedbackService
+    val commandFeedbackService: CommandFeedbackService,
 ) : CommandResultHandler(commandService, commandFeedbackService) {
 
     private val logger = KotlinLogging.logger {}

application/src/main/kotlin/org/gxf/crestdeviceservice/command/service/CommandFeedbackService.kt

@@ -22,7 +22,7 @@ import org.springframework.stereotype.Service
 @Service
 class CommandFeedbackService(
     private val kafkaTemplate: KafkaTemplate<String, SpecificRecordBase>,
-    kafkaProducerProperties: KafkaProducerProperties
+    kafkaProducerProperties: KafkaProducerProperties,
 ) {
     private val topic = kafkaProducerProperties.commandFeedback.topic
 

application/src/main/kotlin/org/gxf/crestdeviceservice/command/service/CommandResultService.kt

@@ -13,7 +13,7 @@ import org.springframework.stereotype.Service
 @Service
 class CommandResultService(
     private val commandService: CommandService,
-    private val commandResultHandlersByType: Map<Command.CommandType, CommandResultHandler>
+    private val commandResultHandlersByType: Map<Command.CommandType, CommandResultHandler>,
 ) {
     private val logger = KotlinLogging.logger {}
 

application/src/main/kotlin/org/gxf/crestdeviceservice/command/service/CommandService.kt

@@ -15,7 +15,7 @@ import org.springframework.stereotype.Service
 @Service
 class CommandService(
     private val commandRepository: CommandRepository,
-    private val commandFeedbackService: CommandFeedbackService
+    private val commandFeedbackService: CommandFeedbackService,
 ) {
     private val logger = KotlinLogging.logger {}
 
@@ -42,7 +42,7 @@ class CommandService(
     private fun deviceHasNewerSameCommand(
         deviceId: String,
         commandType: Command.CommandType,
-        timestampNewCommand: Instant
+        timestampNewCommand: Instant,
     ): Boolean {
         val latestCommandInDatabase = getLatestCommandInDatabase(deviceId, commandType) ?: return false
 
@@ -55,7 +55,7 @@ class CommandService(
             .findAllByDeviceIdAndTypeAndStatusOrderByTimestampIssuedAsc(
                 deviceId,
                 commandType,
-                Command.CommandStatus.IN_PROGRESS
+                Command.CommandStatus.IN_PROGRESS,
             )
             .isNotEmpty()
 
@@ -93,7 +93,7 @@ class CommandService(
     fun getFirstCommandInProgressForDevice(deviceId: String) =
         commandRepository.findFirstByDeviceIdAndStatusOrderByTimestampIssuedAsc(
             deviceId,
-            Command.CommandStatus.IN_PROGRESS
+            Command.CommandStatus.IN_PROGRESS,
         )
 
     fun getAllPendingCommandsForDevice(deviceId: String) =
@@ -102,7 +102,7 @@ class CommandService(
     fun getAllCommandsInProgressForDevice(deviceId: String) =
         commandRepository.findAllByDeviceIdAndStatusOrderByTimestampIssuedAsc(
             deviceId,
-            Command.CommandStatus.IN_PROGRESS
+            Command.CommandStatus.IN_PROGRESS,
         )
 
     fun saveCommand(command: Command) = commandRepository.save(command)

application/src/main/kotlin/org/gxf/crestdeviceservice/config/KafkaConfiguration.kt

@@ -34,7 +34,7 @@ class KafkaConfiguration(private val kafkaProperties: KafkaProperties, private v
         DefaultKafkaConsumerFactory(
             kafkaProperties.buildConsumerProperties(sslBundles),
             StringDeserializer(),
-            AvroDeserializer(listOf(DeviceCredentials.getClassSchema(), Command.getClassSchema()))
+            AvroDeserializer(listOf(DeviceCredentials.getClassSchema(), Command.getClassSchema())),
         )
 
     @Bean
@@ -45,6 +45,6 @@ class KafkaConfiguration(private val kafkaProperties: KafkaProperties, private v
         DefaultKafkaProducerFactory(
             kafkaProperties.buildProducerProperties(sslBundles),
             StringSerializer(),
-            AvroSerializer()
+            AvroSerializer(),
         )
 }

application/src/main/kotlin/org/gxf/crestdeviceservice/config/KafkaProducerProperties.kt

@@ -9,5 +9,5 @@ import org.springframework.boot.context.properties.ConfigurationProperties
 class KafkaProducerProperties(
     val deviceMessage: KafkaProducerTopicProperties,
     val commandFeedback: KafkaProducerTopicProperties,
-    val firmware: KafkaProducerTopicKeyProperties
+    val firmware: KafkaProducerTopicKeyProperties,
 )

application/src/main/kotlin/org/gxf/crestdeviceservice/consumer/IncomingDeviceCredentialsConsumer.kt

@@ -21,7 +21,7 @@ class IncomingDeviceCredentialsConsumer(
     private val deviceService: DeviceService,
     private val pskService: PskService,
     private val pskDecryptionService: PskDecryptionService,
-    private val commandService: CommandService
+    private val commandService: CommandService,
 ) {
     private val logger = KotlinLogging.logger {}
 

application/src/main/kotlin/org/gxf/crestdeviceservice/controller/FirmwareController.kt

@@ -18,10 +18,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes
 
 @Controller
 @RequestMapping("/web/firmware")
-class FirmwareController(
-    val firmwareService: FirmwareService,
-    val firmwareProducerService: FirmwareProducerService,
-) {
+class FirmwareController(val firmwareService: FirmwareService, val firmwareProducerService: FirmwareProducerService) {
     private val logger = KotlinLogging.logger {}
     private val redirectUrl = "redirect:/web/firmware"
 

application/src/main/kotlin/org/gxf/crestdeviceservice/controller/RspController.kt

@@ -42,7 +42,7 @@ class RspController(private val commandService: CommandService) {
                 timestampIssued = Instant.now(),
                 type = commandType,
                 status = Command.CommandStatus.PENDING,
-                commandValue = null
+                commandValue = null,
             )
         )
     }

application/src/main/kotlin/org/gxf/crestdeviceservice/service/DownlinkService.kt

@@ -20,7 +20,7 @@ class DownlinkService(
     private val pskService: PskService,
     private val commandService: CommandService,
     private val messageProperties: MessageProperties,
-    commandGenerators: List<CommandGenerator>
+    commandGenerators: List<CommandGenerator>,
 ) {
 
     private val logger = KotlinLogging.logger {}

application/src/main/kotlin/org/gxf/crestdeviceservice/service/MessageProducerService.kt

@@ -15,7 +15,7 @@ import org.springframework.stereotype.Service
 @Service
 class MessageProducerService(
     private val kafkaTemplate: KafkaTemplate<String, SpecificRecordBase>,
-    private val kafkaProducerProperties: KafkaProducerProperties
+    private val kafkaProducerProperties: KafkaProducerProperties,
 ) {
     private val logger = KotlinLogging.logger {}
 
@@ -28,7 +28,7 @@ class MessageProducerService(
                 deviceId = message["ID"].toString()
                 timestamp = Instant.now().toEpochMilli()
                 payload = message.toString()
-            }
+            },
         )
     }
 }