ktlint

Author: davidatmoj

src/main/kotlin/uk/gov/justice/digital/hmpps/personintegrationapi/common/client/PrisonApiClient.kt

@@ -9,7 +9,6 @@ import org.springframework.web.service.annotation.PutExchange
 import uk.gov.justice.digital.hmpps.personintegrationapi.common.client.dto.UpdateBirthCountry
 import uk.gov.justice.digital.hmpps.personintegrationapi.common.client.request.UpdateBirthPlace
 import uk.gov.justice.digital.hmpps.personintegrationapi.common.client.request.UpdateNationality
-import uk.gov.justice.digital.hmpps.personintegrationapi.common.client.response.MilitaryRecord
 import uk.gov.justice.digital.hmpps.personintegrationapi.common.client.response.MilitaryRecordPrisonDto
 
 @HttpExchange("/api/offenders")

src/main/kotlin/uk/gov/justice/digital/hmpps/personintegrationapi/common/client/response/MilitaryRecord.kt

@@ -3,7 +3,7 @@ package uk.gov.justice.digital.hmpps.personintegrationapi.common.client.response
 import java.time.LocalDate
 
 data class MilitaryRecordPrisonDto(
-  val militaryRecords: List<MilitaryRecord>
+  val militaryRecords: List<MilitaryRecord>,
 )
 
 data class MilitaryRecord(
@@ -24,5 +24,5 @@ data class MilitaryRecord(
   val militaryRankDescription: String?,
   val serviceNumber: String?,
   val disciplinaryActionCode: String?,
-  val disciplinaryActionDescription: String?
-)
+  val disciplinaryActionDescription: String?,
+)

src/main/kotlin/uk/gov/justice/digital/hmpps/personintegrationapi/corepersonrecord/dto/response/MilitaryRecordDto.kt

@@ -1,118 +1,118 @@
 package uk.gov.justice.digital.hmpps.personintegrationapi.corepersonrecord.dto.response
 
-import java.time.LocalDate
 import com.fasterxml.jackson.annotation.JsonInclude
 import com.fasterxml.jackson.annotation.JsonInclude.Include
 import io.swagger.v3.oas.annotations.media.Schema
+import java.time.LocalDate
 
 @JsonInclude(Include.NON_NULL)
 @Schema(description = "DTO representing a military record with details about service in the UK Armed Forces.")
 data class MilitaryRecordDto(
   @Schema(
     description = "Code identifying the war zone where the service took place.",
-    example = "AFG"
+    example = "AFG",
   )
   val warZoneCode: String?,
 
   @Schema(
     description = "Description of the war zone where the service took place.",
-    example = "Afghanistan"
+    example = "Afghanistan",
   )
   val warZoneDescription: String?,
 
   @Schema(
     description = "Start date of the military service.",
-    example = "2017-06-01"
+    example = "2017-06-01",
   )
   val startDate: LocalDate,
 
   @Schema(
     description = "End date of the military service, if applicable.",
-    example = "2019-12-01"
+    example = "2019-12-01",
   )
   val endDate: LocalDate?,
 
   @Schema(
     description = "Code indicating the discharge status from the UK military forces.",
-    example = "HON"
+    example = "HON",
   )
   val militaryDischargeCode: String?,
 
   @Schema(
     description = "Description of the discharge status from the UK military forces.",
-    example = "Honourable"
+    example = "Honourable",
   )
   val militaryDischargeDescription: String?,
 
   @Schema(
     description = "Code identifying the branch of the UK military in which the individual served.",
-    example = "ARM"
+    example = "ARM",
   )
   val militaryBranchCode: String,
 
   @Schema(
     description = "Description of the military branch of the UK Armed Forces.",
-    example = "Army"
+    example = "Army",
   )
   val militaryBranchDescription: String,
 
   @Schema(
     description = "Additional notes or details about the military service.",
-    example = "Deployed to Afghanistan in support of Operation Herrick."
+    example = "Deployed to Afghanistan in support of Operation Herrick.",
   )
   val description: String?,
 
   @Schema(
     description = "Unit number in which the individual served.",
-    example = "2nd Battalion, The Royal Anglian Regiment"
+    example = "2nd Battalion, The Royal Anglian Regiment",
   )
   val unitNumber: String?,
 
   @Schema(
     description = "Location where the individual enlisted in the UK military.",
-    example = "Windsor, Berkshire"
+    example = "Windsor, Berkshire",
   )
   val enlistmentLocation: String?,
 
   @Schema(
     description = "Location where the individual was discharged from the UK military.",
-    example = "Colchester, Essex"
+    example = "Colchester, Essex",
   )
   val dischargeLocation: String?,
 
   @Schema(
     description = "Flag indicating if the individual was registered for UK selective military service (National Service).",
-    example = "false"
+    example = "false",
   )
   val selectiveServicesFlag: Boolean,
 
   @Schema(
     description = "Code identifying the individual's military rank in the UK forces.",
-    example = "CPL_ARM"
+    example = "CPL_ARM",
   )
   val militaryRankCode: String?,
 
   @Schema(
     description = "Description of the individual's military rank in the UK forces.",
-    example = "Corporal"
+    example = "Corporal",
   )
   val militaryRankDescription: String?,
 
   @Schema(
     description = "Service number of the individual within the UK military.",
-    example = "2345678"
+    example = "2345678",
   )
   val serviceNumber: String?,
 
   @Schema(
     description = "Code identifying any disciplinary actions taken against the individual during service.",
-    example = "CM"
+    example = "CM",
   )
   val disciplinaryActionCode: String?,
 
   @Schema(
     description = "Description of any disciplinary actions taken against the individual during service.",
-    example = "Court Martial"
+    example = "Court Martial",
   )
-  val disciplinaryActionDescription: String?
+  val disciplinaryActionDescription: String?,
 )

src/main/kotlin/uk/gov/justice/digital/hmpps/personintegrationapi/corepersonrecord/service/CorePersonRecordService.kt

@@ -71,7 +71,7 @@ class CorePersonRecordService(
       val mappedResponse = response.body?.militaryRecords?.map {
         it.copy(
           militaryRankDescription = it.militaryRankDescription?.replace(rankSuffixPattern, "")?.trim(),
-          )
+        )
         MilitaryRecordDto(
           warZoneCode = it.warZoneCode,
           warZoneDescription = it.warZoneDescription,

src/test/kotlin/uk/gov/justice/digital/hmpps/personintegrationapi/corepersonrecord/resource/CorePersonRecordV1ResourceIntTest.kt

@@ -253,7 +253,7 @@ class CorePersonRecordV1ResourceIntTest : IntegrationTestBase() {
               militaryRankDescription = "Military Rank One",
               serviceNumber = "Service Number One",
               disciplinaryActionCode = "DA1",
-              disciplinaryActionDescription = "Disciplinary Action One"
+              disciplinaryActionDescription = "Disciplinary Action One",
             ),
             MilitaryRecordDto(
               warZoneCode = "WZ2",

src/test/kotlin/uk/gov/justice/digital/hmpps/personintegrationapi/corepersonrecord/service/CorePersonRecordServiceTest.kt

@@ -145,9 +145,9 @@ class CorePersonRecordServiceTest {
           militaryRankDescription = "Military Rank One (Army)",
           serviceNumber = "Service Number One",
           disciplinaryActionCode = "DA1",
-          disciplinaryActionDescription = "Disciplinary Action One"
-        )
-      )
+          disciplinaryActionDescription = "Disciplinary Action One",
+        ),
+      ),
     )
 
     private val militaryRecords = listOf(
@@ -169,14 +169,14 @@ class CorePersonRecordServiceTest {
         militaryRankDescription = "Military Rank One",
         serviceNumber = "Service Number One",
         disciplinaryActionCode = "DA1",
-        disciplinaryActionDescription = "Disciplinary Action One"
-      )
+        disciplinaryActionDescription = "Disciplinary Action One",
+      ),
     )
 
     @Test
     fun `can retrieve military records`() {
       whenever(prisonApiClient.getMilitaryRecords(prisonerNumber)).thenReturn(
-        ResponseEntity.ok(militaryRecordsPrisonDto)
+        ResponseEntity.ok(militaryRecordsPrisonDto),
       )
 
       val response = underTest.getMilitaryRecords(prisonerNumber)
@@ -188,7 +188,7 @@ class CorePersonRecordServiceTest {
     @ValueSource(ints = [400, 401, 403, 404, 422, 500])
     fun `propagates non-2xx status codes`(status: Int) {
       whenever(prisonApiClient.getMilitaryRecords(prisonerNumber)).thenReturn(
-        ResponseEntity.status(status).build()
+        ResponseEntity.status(status).build(),
       )
 
       val response = underTest.getMilitaryRecords(prisonerNumber)