PI-2032 Publish messages using default thread pool (#3541)

ministryofjustice · Mar 25, 2024 · 32c7d8c · 32c7d8c
1 parent 2858ac0
commit 32c7d8c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/.../src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/PrisonMatchingIntegrationTest.kt b/.../src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/PrisonMatchingIntegrationTest.kt
@@ -165,7 +165,7 @@ internal class PrisonMatchingIntegrationTest {
             .perform(post("/person/match-by-crn?dryRun=false").withToken().withJson(listOf(crn)))
             .andExpect(status().is2xxSuccessful)
 
-        verify(telemetryService, timeout(300_000)).trackEvent(
+        verify(telemetryService, timeout(5000)).trackEvent(
             "MatchResultSuccess", mapOf(
                 "reason" to "Matched CRN A000003 to NOMS number G5541WW and custody $custodyId to 13831A",
                 "crn" to "A000003",

diff --git a/...-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/controller/MatchingController.kt b/...-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/controller/MatchingController.kt
@@ -18,7 +18,7 @@ class MatchingController(private val notifier: Notifier) {
         @Size(min = 1, max = 500, message = "Please provide between 1 and 500 CRNs. Leave blank to match all CRNs.")
         @RequestBody crns: List<String>?
     ) {
-        Thread.ofVirtual().start { notifier.requestPrisonMatching(crns ?: listOf(), dryRun) }
+        notifier.requestPrisonMatching(crns ?: listOf(), dryRun)
     }
 
     @ResponseStatus(HttpStatus.ACCEPTED)
@@ -29,6 +29,6 @@ class MatchingController(private val notifier: Notifier) {
         @Size(min = 1, max = 500, message = "Please provide between 1 and 500 NOMS numbers.")
         @RequestBody nomsNumbers: List<String>
     ) {
-        Thread.ofVirtual().start { notifier.requestProbationMatching(nomsNumbers, dryRun) }
+        notifier.requestProbationMatching(nomsNumbers, dryRun)
     }
 }
diff --git a/...-identifier-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/messaging/Notifier.kt b/...-identifier-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/messaging/Notifier.kt
@@ -1,6 +1,7 @@
 package uk.gov.justice.digital.hmpps.messaging
 
 import org.springframework.beans.factory.annotation.Qualifier
+import org.springframework.scheduling.annotation.Async
 import org.springframework.stereotype.Service
 import uk.gov.justice.digital.hmpps.entity.PersonRepository
 import uk.gov.justice.digital.hmpps.message.*
@@ -18,12 +19,14 @@ class Notifier(
         const val REQUEST_PROBATION_MATCH = "prison-identifier.internal.probation-match-requested"
     }
 
+    @Async
     fun requestPrisonMatching(crns: List<String>, dryRun: Boolean) {
         crns.ifEmpty { personRepository.findAllCrns() }.asSequence()
             .map { notification(REQUEST_PRISON_MATCH, PersonIdentifier("CRN", it), dryRun) }
             .forEach { queuePublisher.publish(it) }
     }
 
+    @Async
     fun requestProbationMatching(nomsNumbers: List<String>, dryRun: Boolean) {
         nomsNumbers.asSequence()
             .map { notification(REQUEST_PROBATION_MATCH, PersonIdentifier("NOMS", it), dryRun) }

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