Upgraded hmpps gradle springboot from 5.1.0 to 5.1.2 (#90)

* Upgraded hmpps gradle springboot from 5.1.0 to 5.1.2

* Linting now adds trailing commas as recommended practice

Author: mcoffey-mt

build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-  id("uk.gov.justice.hmpps.gradle-spring-boot") version "5.1.0"
+  id("uk.gov.justice.hmpps.gradle-spring-boot") version "5.1.2"
   kotlin("plugin.spring") version "1.8.0"
 }
 

src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/config/HmppsIntegrationApiExceptionHandler.kt

@@ -23,8 +23,8 @@ class HmppsIntegrationApiExceptionHandler {
         ErrorResponse(
           status = BAD_REQUEST,
           userMessage = "Validation failure: ${e.message}",
-          developerMessage = e.message
-        )
+          developerMessage = e.message,
+        ),
       )
   }
 
@@ -37,8 +37,8 @@ class HmppsIntegrationApiExceptionHandler {
         ErrorResponse(
           status = NOT_FOUND,
           userMessage = "404 Not found error: ${e.message}",
-          developerMessage = e.message
-        )
+          developerMessage = e.message,
+        ),
       )
   }
 
@@ -51,8 +51,8 @@ class HmppsIntegrationApiExceptionHandler {
         ErrorResponse(
           status = INTERNAL_SERVER_ERROR,
           userMessage = "Authentication error: ${e.message}",
-          developerMessage = e.message
-        )
+          developerMessage = e.message,
+        ),
       )
   }
 
@@ -65,8 +65,8 @@ class HmppsIntegrationApiExceptionHandler {
         ErrorResponse(
           status = INTERNAL_SERVER_ERROR,
           userMessage = "Unexpected error: ${e.message}",
-          developerMessage = e.message
-        )
+          developerMessage = e.message,
+        ),
       )
   }
 
@@ -80,14 +80,14 @@ data class ErrorResponse(
   val errorCode: Int? = null,
   val userMessage: String? = null,
   val developerMessage: String? = null,
-  val moreInfo: String? = null
+  val moreInfo: String? = null,
 ) {
   constructor(
     status: HttpStatus,
     errorCode: Int? = null,
     userMessage: String? = null,
     developerMessage: String? = null,
-    moreInfo: String? = null
+    moreInfo: String? = null,
   ) :
     this(status.value(), errorCode, userMessage, developerMessage, moreInfo)
 }

src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/config/RequestLogger.kt

@@ -14,8 +14,9 @@ class RequestLogger() : HandlerInterceptor {
 
   override fun preHandle(request: HttpServletRequest, response: HttpServletResponse, handler: Any): Boolean {
     // log. allows us ot log at different levels
-    if (log.isDebugEnabled)
+    if (log.isDebugEnabled) {
       log.debug(RetrieveRequestData(request))
+    }
 
     // Informs the super to continue processing this request
     return true

src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/config/TomcatConfig.kt

@@ -16,7 +16,7 @@ class TomcatConfig {
       factory.addConnectorCustomizers(
         TomcatConnectorCustomizer { connector: Connector ->
           connector.encodedSolidusHandling = EncodedSolidusHandling.PASS_THROUGH.value
-        }
+        },
       )
     }
   }

src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/controllers/ImageController.kt

@@ -11,7 +11,7 @@ import uk.gov.justice.digital.hmpps.hmppsintegrationapi.services.GetImageService
 @RestController
 @RequestMapping("/images")
 class ImageController(
-  @Autowired val getImageService: GetImageService
+  @Autowired val getImageService: GetImageService,
 ) {
   @GetMapping("{id}")
   fun getImage(@PathVariable id: Int): ResponseEntity<ByteArray> {

src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/controllers/PersonController.kt

@@ -24,13 +24,13 @@ class PersonController(
   @Autowired val getPersonService: GetPersonService,
   @Autowired val getPersonsService: GetPersonsService,
   @Autowired val getImageMetadataForPersonService: GetImageMetadataForPersonService,
-  @Autowired val getAddressesForPersonService: GetAddressesForPersonService
+  @Autowired val getAddressesForPersonService: GetAddressesForPersonService,
 ) {
 
   @GetMapping
   fun getPersons(
     @RequestParam(required = false, name = "first_name") firstName: String?,
-    @RequestParam(required = false, name = "last_name") lastName: String?
+    @RequestParam(required = false, name = "last_name") lastName: String?,
   ): Map<String, List<Person?>> {
     if (firstName == null && lastName == null) {
       throw ValidationException("No query parameters specified.")

src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/extensions/WebClientWrapper.kt

@@ -5,7 +5,7 @@ import org.springframework.web.reactive.function.BodyInserters
 import org.springframework.web.reactive.function.client.WebClient
 
 class WebClientWrapper(
-  val baseUrl: String
+  val baseUrl: String,
 ) {
   val client: WebClient = WebClient
     .builder()
@@ -17,8 +17,9 @@ class WebClientWrapper(
       .uri(uri)
       .header("Authorization", "Bearer $token")
 
-    if (method == HttpMethod.POST && requestBody != null)
+    if (method == HttpMethod.POST && requestBody != null) {
       responseBodySpec.body(BodyInserters.fromValue(requestBody))
+    }
 
     return responseBodySpec.retrieve()
       .bodyToMono(T::class.java)
@@ -30,8 +31,9 @@ class WebClientWrapper(
       .uri(uri)
       .header("Authorization", "Bearer $token")
 
-    if (method == HttpMethod.POST && requestBody != null)
+    if (method == HttpMethod.POST && requestBody != null) {
       responseBodySpec.body(BodyInserters.fromValue(requestBody))
+    }
 
     return responseBodySpec.retrieve()
       .bodyToFlux(T::class.java)

src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/gateways/ProbationOffenderSearchGateway.kt

@@ -29,7 +29,7 @@ class ProbationOffenderSearchGateway(@Value("\${services.probation-offender-sear
         HttpMethod.POST,
         "/search",
         token,
-        mapOf("pncNumber" to pncId, "valid" to true)
+        mapOf("pncNumber" to pncId, "valid" to true),
       )
 
       if (offenders.isNotEmpty()) offenders.first().toPerson() else null
@@ -58,9 +58,10 @@ class ProbationOffenderSearchGateway(@Value("\${services.probation-offender-sear
 
     if (offender.isEmpty()) return null
 
-    return if (offender.first().contactDetails.addresses.isNotEmpty())
+    return if (offender.first().contactDetails.addresses.isNotEmpty()) {
       offender.first().contactDetails.addresses.map { it.toAddress() }
-    else
+    } else {
       listOf()
+    }
   }
 }

src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/health/ExternalHealthIndicator.kt

@@ -34,10 +34,11 @@ open class ExternalHealthIndicator(url: String) : HealthIndicator {
         .build()
     }
 
-    if (response.statusCode() != 200)
+    if (response.statusCode() != 200) {
       return healthStatus.up()
         .withDetail("httpStatusCode", response.statusCode())
         .build()
+    }
 
     return healthStatus.build()
   }

src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/models/Address.kt

@@ -1,5 +1,5 @@
 package uk.gov.justice.digital.hmpps.hmppsintegrationapi.models
 
 data class Address(
-  val postcode: String?
+  val postcode: String?,
 )

src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/models/Alias.kt

@@ -10,5 +10,5 @@ data class Alias(
   @JsonAlias("middleNames")
   val middleName: String? = null,
   @JsonAlias("dob")
-  var dateOfBirth: LocalDate? = null
+  var dateOfBirth: LocalDate? = null,
 )

src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/models/ImageMetadata.kt

@@ -7,5 +7,5 @@ data class ImageMetadata(
   val captureDate: LocalDate,
   val view: String,
   val orientation: String,
-  val type: String
+  val type: String,
 )

src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/models/Person.kt

@@ -12,5 +12,5 @@ data class Person(
   val dateOfBirth: LocalDate? = null,
   @JsonAlias("offenderAliases")
   val aliases: List<Alias> = listOf(),
-  val prisonerId: String? = null
+  val prisonerId: String? = null,
 )

src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/models/nomis/Address.kt

@@ -3,7 +3,7 @@ package uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.nomis
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.Address as IntegrationAPIAddress
 
 data class Address(
-  val postalCode: String
+  val postalCode: String,
 ) {
   fun toAddress() = IntegrationAPIAddress(postcode = this.postalCode)
 }

src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/models/nomis/Alias.kt

@@ -6,5 +6,5 @@ data class Alias(
   val firstName: String,
   val lastName: String,
   val middleName: String? = null,
-  var dob: LocalDate? = null
+  var dob: LocalDate? = null,
 )

src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/models/nomis/ImageDetail.kt

@@ -8,13 +8,13 @@ class ImageDetail(
   val captureDate: LocalDate,
   val imageView: String,
   val imageOrientation: String,
-  val imageType: String
+  val imageType: String,
 ) {
   fun toImageMetadata(): ImageMetadata = ImageMetadata(
     id = this.imageId,
     captureDate = this.captureDate,
     view = this.imageView,
     orientation = this.imageOrientation,
-    type = this.imageType
+    type = this.imageType,
   )
 }

src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/models/nomis/Offender.kt

@@ -10,7 +10,7 @@ data class Offender(
   val lastName: String,
   val middleName: String? = null,
   val dateOfBirth: LocalDate? = null,
-  val aliases: List<nomisAlias> = listOf()
+  val aliases: List<nomisAlias> = listOf(),
 ) {
   fun toPerson(): Person = Person(
     firstName = this.firstName,
@@ -22,8 +22,8 @@ data class Offender(
         it.firstName,
         it.lastName,
         it.middleName,
-        it.dob
+        it.dob,
       )
-    }
+    },
   )
 }

src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/models/prisoneroffendersearch/GlobalSearch.kt

@@ -1,5 +1,5 @@
 package uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.prisoneroffendersearch
 
 class GlobalSearch(
-  val content: List<Prisoner>
+  val content: List<Prisoner>,
 )

src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/models/prisoneroffendersearch/Prisoner.kt

@@ -10,7 +10,7 @@ data class Prisoner(
   val middleNames: String? = null,
   val dateOfBirth: LocalDate? = null,
   val aliases: List<PrisonerAlias> = listOf(),
-  val prisonerNumber: String? = null
+  val prisonerNumber: String? = null,
 ) {
   fun toPerson(): Person = Person(
     firstName = this.firstName,
@@ -22,9 +22,9 @@ data class Prisoner(
         it.firstName,
         it.lastName,
         it.middleNames,
-        it.dateOfBirth
+        it.dateOfBirth,
       )
     },
-    prisonerId = this.prisonerNumber
+    prisonerId = this.prisonerNumber,
   )
 }

src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/models/prisoneroffendersearch/PrisonerAlias.kt

@@ -6,5 +6,5 @@ data class PrisonerAlias(
   val firstName: String,
   val lastName: String,
   val middleNames: String? = null,
-  var dateOfBirth: LocalDate? = null
+  var dateOfBirth: LocalDate? = null,
 )

src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/models/probationoffendersearch/Address.kt

@@ -3,7 +3,7 @@ package uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.probationoffende
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.Address as IntegrationAPIAddress
 
 data class Address(
-  val postcode: String?
+  val postcode: String?,
 ) {
   fun toAddress() = IntegrationAPIAddress(postcode = this.postcode)
 }

src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/models/probationoffendersearch/ContactDetails.kt

@@ -1,5 +1,5 @@
 package uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.probationoffendersearch
 
 data class ContactDetails(
-  val addresses: List<Address> = listOf()
+  val addresses: List<Address> = listOf(),
 )

src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/models/probationoffendersearch/Offender.kt

@@ -10,7 +10,7 @@ data class Offender(
   val middleNames: List<String> = listOf(),
   val dateOfBirth: LocalDate? = null,
   val offenderAliases: List<OffenderAlias> = listOf(),
-  val contactDetails: ContactDetails = ContactDetails()
+  val contactDetails: ContactDetails = ContactDetails(),
 ) {
   fun toPerson(): Person = Person(
     firstName = this.firstName,
@@ -22,8 +22,8 @@ data class Offender(
         it.firstName,
         it.surname,
         it.middleNames.joinToString(" "),
-        it.dateOfBirth
+        it.dateOfBirth,
       )
-    }
+    },
   )
 }

src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/models/probationoffendersearch/OffenderAlias.kt

@@ -6,5 +6,5 @@ data class OffenderAlias(
   val firstName: String,
   val surname: String,
   val middleNames: List<String> = listOf(),
-  var dateOfBirth: LocalDate? = null
+  var dateOfBirth: LocalDate? = null,
 )

src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/services/GetAddressesForPersonService.kt

@@ -11,16 +11,17 @@ import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.Address
 class GetAddressesForPersonService(
   @Autowired val probationOffenderSearchGateway: ProbationOffenderSearchGateway,
   @Autowired val prisonerOffenderSearchGateway: PrisonerOffenderSearchGateway,
-  @Autowired val nomisGateway: NomisGateway
+  @Autowired val nomisGateway: NomisGateway,
 ) {
   fun execute(pncId: String): List<Address>? {
     val personFromPrisonerOffenderSearch = prisonerOffenderSearchGateway.getPersons(pncId = pncId)
 
     val addressesFromNomis = nomisGateway.getAddressesForPerson(personFromPrisonerOffenderSearch.first().prisonerId!!)
     val addressesFromProbationOffenderSearch = probationOffenderSearchGateway.getAddressesForPerson(pncId)
 
-    if (addressesFromNomis == null && addressesFromProbationOffenderSearch == null)
+    if (addressesFromNomis == null && addressesFromProbationOffenderSearch == null) {
       return null
+    }
 
     return addressesFromProbationOffenderSearch?.plus(addressesFromNomis.orEmpty())
   }

src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/services/GetImageMetadataForPersonService.kt

@@ -9,7 +9,7 @@ import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.ImageMetadata
 @Service
 class GetImageMetadataForPersonService(
   @Autowired val nomisGateway: NomisGateway,
-  @Autowired val prisonerOffenderSearchGateway: PrisonerOffenderSearchGateway
+  @Autowired val prisonerOffenderSearchGateway: PrisonerOffenderSearchGateway,
 ) {
   fun execute(pncId: String): List<ImageMetadata> {
     val personFromPrisonerOffenderSearch = prisonerOffenderSearchGateway.getPersons(pncId = pncId)

src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/services/GetPersonService.kt

@@ -9,7 +9,7 @@ import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.Person
 @Service
 class GetPersonService(
   @Autowired val prisonerOffenderSearchGateway: PrisonerOffenderSearchGateway,
-  @Autowired val probationOffenderSearchGateway: ProbationOffenderSearchGateway
+  @Autowired val probationOffenderSearchGateway: ProbationOffenderSearchGateway,
 ) {
   fun execute(pncId: String): Map<String, Person?>? {
     val personFromPrisonerOffenderSearch = prisonerOffenderSearchGateway.getPersons(pncId = pncId)
@@ -21,7 +21,7 @@ class GetPersonService(
 
     return mapOf(
       "prisonerOffenderSearch" to personFromPrisonerOffenderSearch.first(),
-      "probationOffenderSearch" to personFromProbationOffenderSearch
+      "probationOffenderSearch" to personFromProbationOffenderSearch,
     )
   }
 }

src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/services/GetPersonsService.kt

@@ -9,7 +9,7 @@ import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.Person
 @Service
 class GetPersonsService(
   @Autowired val prisonerOffenderSearchGateway: PrisonerOffenderSearchGateway,
-  @Autowired val probationOffenderSearchGateway: ProbationOffenderSearchGateway
+  @Autowired val probationOffenderSearchGateway: ProbationOffenderSearchGateway,
 ) {
 
   fun execute(firstName: String?, lastName: String?): List<Person?> {

src/test/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/controllers/ImageControllerTest.kt

@@ -46,4 +46,4 @@ internal class ImageControllerTest(
       result.response.contentAsByteArray.shouldBe(image)
     }
   }
-})
+},)