Merge branch 'main' into PI-1668

ministryofjustice · Dec 5, 2023 · bc2a10d · bc2a10d
2 parents c68802a + 395e2c3
commit bc2a10d
Show file tree

Hide file tree

Showing 68 changed files with 167 additions and 107 deletions.
diff --git a/.github/actions/analyse/action.yml b/.github/actions/analyse/action.yml
@@ -38,7 +38,7 @@ runs:
 
     - uses: actions/setup-java@v3
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'temurin'
 
     - name: Sonar analysis

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -78,7 +78,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v3
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
       - uses: gradle/gradle-build-action@v2
 

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -117,7 +117,7 @@ jobs:
       - uses: actions/setup-java@v3
         if: startsWith(steps.check_config.outputs.api_path, 'http')
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
       - uses: gradle/gradle-build-action@v2 # enables caching
         if: startsWith(steps.check_config.outputs.api_path, 'http')

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -23,7 +23,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v3
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
       - name: Setup GPG commit verification
         uses: crazy-max/ghaction-import-gpg@82a020f1f7f605c65dd2449b392a52c3fcfef7ef # v6.0.0

diff --git a/.github/workflows/security.yml b/.github/workflows/security.yml
@@ -107,7 +107,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: temurin
 
       - name: Build jars

diff --git a/.github/workflows/templates.yml b/.github/workflows/templates.yml
@@ -28,7 +28,7 @@ jobs:
 
       - uses: actions/setup-java@v3
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
 
       - name: Render project template

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -40,13 +40,13 @@ allprojects {
 
     tasks {
         withType<JavaCompile> {
-            sourceCompatibility = "17"
+            sourceCompatibility = "21"
         }
 
         withType<KotlinCompile> {
             kotlinOptions {
                 freeCompilerArgs = listOf("-Xjsr305=strict")
-                jvmTarget = "17"
+                jvmTarget = "21"
             }
         }
 

diff --git a/buildSrc/src/main/kotlin/uk/gov/justice/digital/hmpps/plugins/JibConfigPlugin.kt b/buildSrc/src/main/kotlin/uk/gov/justice/digital/hmpps/plugins/JibConfigPlugin.kt
@@ -22,7 +22,7 @@ class JibConfigPlugin : Plugin<Project> {
                     user = "2000:2000"
                 }
                 from {
-                    image = System.getenv("JIB_FROM_IMAGE") ?: "eclipse-temurin:17-jre-alpine"
+                    image = System.getenv("JIB_FROM_IMAGE") ?: "eclipse-temurin:21-jre-alpine"
                 }
                 to {
                     image = "ghcr.io/ministryofjustice/hmpps-probation-integration-services/${project.name}"

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,8 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=3e1af3ae886920c3ac87f7a91f816c0c7c436f276a6eefdb3da152100fef72ae
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+zipStorePath=wrapper/dists
diff --git a/libs/commons/src/main/kotlin/uk/gov/justice/digital/hmpps/config/ThreadConfig.kt b/libs/commons/src/main/kotlin/uk/gov/justice/digital/hmpps/config/ThreadConfig.kt
diff --git a/...essaging/src/main/kotlin/uk/gov/justice/digital/hmpps/listener/AwsNotificationListener.kt b/...essaging/src/main/kotlin/uk/gov/justice/digital/hmpps/listener/AwsNotificationListener.kt
@@ -15,7 +15,7 @@ import org.springframework.orm.ObjectOptimisticLockingFailureException
 import org.springframework.stereotype.Component
 import org.springframework.transaction.CannotCreateTransactionException
 import org.springframework.transaction.UnexpectedRollbackException
-import org.springframework.web.client.HttpStatusCodeException
+import org.springframework.web.client.RestClientException
 import uk.gov.justice.digital.hmpps.config.AwsCondition
 import uk.gov.justice.digital.hmpps.messaging.NotificationHandler
 import uk.gov.justice.digital.hmpps.retry.retry
@@ -35,7 +35,7 @@ class AwsNotificationListener(
             retry(
                 3,
                 listOf(
-                    HttpStatusCodeException::class,
+                    RestClientException::class,
                     CannotAcquireLockException::class,
                     ObjectOptimisticLockingFailureException::class,
                     CannotCreateTransactionException::class,

diff --git a/...ent/src/main/kotlin/uk/gov/justice/digital/hmpps/config/security/HmppsAuthClientConfig.kt b/...ent/src/main/kotlin/uk/gov/justice/digital/hmpps/config/security/HmppsAuthClientConfig.kt
@@ -20,6 +20,7 @@ class HmppsAuthClientConfig(
     fun oauth2Client() = restClientBuilder
         .requestFactory(withTimeouts(Duration.ofSeconds(1), Duration.ofSeconds(5)))
         .requestInterceptor(HmppsAuthInterceptor(clientManager, "default"))
+        .requestInterceptor(RetryInterceptor())
         .build()
 }
 

diff --git a/...h-client/src/main/kotlin/uk/gov/justice/digital/hmpps/config/security/RetryInterceptor.kt b/...h-client/src/main/kotlin/uk/gov/justice/digital/hmpps/config/security/RetryInterceptor.kt
@@ -0,0 +1,18 @@
+package uk.gov.justice.digital.hmpps.config.security
+
+import org.springframework.http.HttpRequest
+import org.springframework.http.client.ClientHttpRequestExecution
+import org.springframework.http.client.ClientHttpRequestInterceptor
+import org.springframework.http.client.ClientHttpResponse
+import org.springframework.web.client.RestClientException
+import uk.gov.justice.digital.hmpps.retry.retry
+
+class RetryInterceptor : ClientHttpRequestInterceptor {
+    override fun intercept(
+        request: HttpRequest,
+        body: ByteArray,
+        execution: ClientHttpRequestExecution
+    ): ClientHttpResponse = retry(3, listOf(RestClientException::class)) {
+        execution.execute(request, body)
+    }
+}
diff --git a/projects/approved-premises-and-delius/src/main/resources/application.yml b/projects/approved-premises-and-delius/src/main/resources/application.yml
@@ -27,6 +27,7 @@ spring:
     provider:
       hmpps-auth:
         token-uri: http://localhost:${wiremock.port}/auth/oauth/token
+  threads.virtual.enabled: true
 
 springdoc.default-produces-media-type: application/json
 

diff --git a/projects/approved-premises-and-oasys/src/main/resources/application.yml b/projects/approved-premises-and-oasys/src/main/resources/application.yml
@@ -14,6 +14,7 @@ spring:
     provider:
       ords-oasys-auth:
         token-uri: http://localhost:${wiremock.port}/eor/oasys/oauth/token
+  threads.virtual.enabled: true
 
 springdoc.default-produces-media-type: application/json
 

diff --git a/projects/arns-and-delius/src/main/resources/application.yml b/projects/arns-and-delius/src/main/resources/application.yml
@@ -16,6 +16,7 @@ spring:
           global_temporary:
             create_tables: false
             drop_tables: false
+  threads.virtual.enabled: true
 springdoc.default-produces-media-type: application/json
 
 delius.db.username: ArnsAndDelius # Should match value in [deploy/database/access.yml].

diff --git a/projects/cas3-and-delius/src/main/resources/application.yml b/projects/cas3-and-delius/src/main/resources/application.yml
@@ -26,6 +26,7 @@ spring:
     provider:
       hmpps-auth:
         token-uri: http://localhost:${wiremock.port}/auth/oauth/token
+  threads.virtual.enabled: true
 
 springdoc.default-produces-media-type: application/json
 

diff --git a/projects/court-case-and-delius/src/main/resources/application.yml b/projects/court-case-and-delius/src/main/resources/application.yml
@@ -26,6 +26,7 @@ spring:
     provider:
       hmpps-auth:
         token-uri: http://localhost:${wiremock.port}/auth/oauth/token
+  threads.virtual.enabled: true
 
 springdoc.default-produces-media-type: application/json
 

diff --git a/projects/create-and-vary-a-licence-and-delius/src/main/resources/application.yml b/projects/create-and-vary-a-licence-and-delius/src/main/resources/application.yml
@@ -30,6 +30,7 @@ spring:
     provider:
       hmpps-auth:
         token-uri: http://localhost:${wiremock.port}/auth/oauth/token
+  threads.virtual.enabled: true
 
 springdoc.default-produces-media-type: application/json
 

diff --git a/projects/custody-key-dates-and-delius/src/main/resources/application.yml b/projects/custody-key-dates-and-delius/src/main/resources/application.yml
@@ -26,6 +26,7 @@ spring:
     provider:
       hmpps-auth:
         token-uri: http://localhost:${wiremock.port}/auth/oauth/token
+  threads.virtual.enabled: true
 
 delius.db.username: CustodyKeyDatesAndDelius # Should match value in [deploy/database/access.yml].
 

diff --git a/projects/domain-events-and-delius/src/main/resources/application.yml b/projects/domain-events-and-delius/src/main/resources/application.yml
@@ -16,6 +16,8 @@ spring:
           global_temporary:
             create_tables: false
             drop_tables: false
+  threads.virtual.enabled: true
+
 springdoc.default-produces-media-type: application/json
 
 

diff --git a/projects/dps-and-delius/src/main/resources/application.yml b/projects/dps-and-delius/src/main/resources/application.yml
@@ -17,6 +17,7 @@ spring:
             create_tables: false
             drop_tables: false
     open-in-view: false # this prevents aborted streaming requests from leaving a DB connection in-use
+  threads.virtual.enabled: true
 
 springdoc.default-produces-media-type: application/json
 

diff --git a/projects/effective-proposal-framework-and-delius/src/main/resources/application.yml b/projects/effective-proposal-framework-and-delius/src/main/resources/application.yml
@@ -16,6 +16,7 @@ spring:
           global_temporary:
             create_tables: false
             drop_tables: false
+  threads.virtual.enabled: true
 
 springdoc.default-produces-media-type: application/json
 

diff --git a/projects/external-api-and-delius/src/main/resources/application.yml b/projects/external-api-and-delius/src/main/resources/application.yml
@@ -16,6 +16,7 @@ spring:
           global_temporary:
             create_tables: false
             drop_tables: false
+  threads.virtual.enabled: true
 
 springdoc.default-produces-media-type: application/json
 

diff --git a/projects/hdc-licences-and-delius/src/main/resources/application.yml b/projects/hdc-licences-and-delius/src/main/resources/application.yml
@@ -20,6 +20,7 @@ spring:
     base: dc=moj,dc=com
     base-environment:
       java.naming.ldap.derefAliases: never
+  threads.virtual.enabled: true
 
 springdoc.default-produces-media-type: application/json
 

diff --git a/projects/hmpps-auth-and-delius/src/main/resources/application.yml b/projects/hmpps-auth-and-delius/src/main/resources/application.yml
@@ -20,6 +20,7 @@ spring:
     base: dc=moj,dc=com
     base-environment:
       java.naming.ldap.derefAliases: never
+  threads.virtual.enabled: true
 
 springdoc.default-produces-media-type: application/json
 

diff --git a/projects/make-recall-decisions-and-delius/src/main/resources/application.yml b/projects/make-recall-decisions-and-delius/src/main/resources/application.yml
@@ -30,6 +30,8 @@ spring:
     provider:
       hmpps-auth:
         token-uri: http://localhost:${wiremock.port}/auth/oauth/token
+  threads.virtual.enabled: true
+
 springdoc.default-produces-media-type: application/json
 
 delius.db.username: MakeRecallDecisionsAndDelius # Should match value in [deploy/database/access.yml].

diff --git a/projects/manage-offences-and-delius/src/main/resources/application.yml b/projects/manage-offences-and-delius/src/main/resources/application.yml
@@ -26,6 +26,7 @@ spring:
     provider:
       hmpps-auth:
         token-uri: http://localhost:${wiremock.port}/auth/oauth/token
+  threads.virtual.enabled: true
 
 delius.db.username: ManageOffencesAndDelius # Should match value in [deploy/database/access.yml].
 

diff --git a/...cts/manage-pom-cases-and-delius/src/dev/resources/simulations/__files/new-allocation.json b/...cts/manage-pom-cases-and-delius/src/dev/resources/simulations/__files/new-allocation.json
@@ -1,7 +1,8 @@
 {
   "manager": {
     "forename": "John",
-    "surname": "Smith"
+    "surname": "Smith",
+    "email": "[email protected]"
   },
   "prison": {
     "code": "SWI"

diff --git a/...ts/manage-pom-cases-and-delius/src/dev/resources/simulations/__files/pom-reallocated.json b/...ts/manage-pom-cases-and-delius/src/dev/resources/simulations/__files/pom-reallocated.json
@@ -1,7 +1,8 @@
 {
   "manager": {
     "forename": "James",
-    "surname": "Brown"
+    "surname": "Brown",
+    "email": "[email protected]"
   },
   "prison": {
     "code": "SWI"

diff --git a/...integrationTest/kotlin/uk/gov/justice/digital/hmpps/AllocationMessagingIntegrationTest.kt b/...integrationTest/kotlin/uk/gov/justice/digital/hmpps/AllocationMessagingIntegrationTest.kt
@@ -97,6 +97,7 @@ internal class AllocationMessagingIntegrationTest {
         assertThat(prisonManager?.allocationReason?.code, equalTo("AUT"))
         assertThat(prisonManager?.staff?.forename, equalTo("John"))
         assertThat(prisonManager?.staff?.surname, equalTo("Smith"))
+        assertThat(prisonManager?.emailAddress, equalTo("[email protected]"))
 
         val contacts = contactRepository.findAll().filter { it.personId == PersonGenerator.DEFAULT.id }
         assertThat(contacts.map { it.type.code }, hasItems(ContactType.Code.POM_AUTO_ALLOCATION.value))
@@ -137,6 +138,7 @@ internal class AllocationMessagingIntegrationTest {
         assertThat(prisonManager?.allocationReason?.code, equalTo("INA"))
         assertThat(prisonManager?.staff?.forename, equalTo("James"))
         assertThat(prisonManager?.staff?.surname, equalTo("Brown"))
+        assertThat(prisonManager?.emailAddress, equalTo("[email protected]"))
         assertNotNull(prisonManager?.responsibleOfficer())
         assertNull(prisonManager?.responsibleOfficer()?.endDate)
 

diff --git a/.../kotlin/uk/gov/justice/digital/hmpps/integrations/delius/provider/entity/PrisonManager.kt b/.../kotlin/uk/gov/justice/digital/hmpps/integrations/delius/provider/entity/PrisonManager.kt
@@ -100,6 +100,8 @@ class PrisonManager(
     @Column(nullable = false)
     var lastUpdatedDatetime: ZonedDateTime = ZonedDateTime.now()
 
+    var emailAddress: String? = null
+
     fun isUnallocated() = staff.code.endsWith("U")
 
     fun responsibleOfficer(): ResponsibleOfficer? = responsibleOfficers.firstOrNull { it.endDate == null }