Merge branch 'main' into dev/send-in-token

Author: ivanskodje

ebms-provider/src/main/kotlin/no/nav/emottak/ebms/processing/ProcessingService.kt

@@ -3,7 +3,9 @@ package no.nav.emottak.ebms.processing
 import io.ktor.client.call.body
 import io.ktor.client.plugins.ClientRequestException
 import io.ktor.http.HttpStatusCode
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withContext
 import no.nav.emottak.ebms.PayloadProcessingClient
 import no.nav.emottak.ebms.logger
 import no.nav.emottak.ebms.model.Acknowledgment
@@ -20,7 +22,7 @@ import no.nav.emottak.melding.model.PayloadResponse
 
 class ProcessingService(private val httpClient: PayloadProcessingClient) {
 
-    private fun processMessage(
+    private suspend fun processMessage(
         payloadMessage: PayloadMessage,
         payloadProcessing: PayloadProcessing,
         direction: Direction
@@ -35,9 +37,11 @@ class ProcessingService(private val httpClient: PayloadProcessingClient) {
             )
             Pair(
                 payloadMessage.copy(
-                    payload = runBlocking {
-                        httpClient.postPayloadRequest(payloadRequest)
-                    }.processedPayload!!
+                    payload = withContext(Dispatchers.IO) {
+                        runBlocking {
+                            httpClient.postPayloadRequest(payloadRequest)
+                        }.processedPayload!!
+                    }
                 ),
                 direction
             )
@@ -77,17 +81,17 @@ class ProcessingService(private val httpClient: PayloadProcessingClient) {
     private fun fail(fail: EbmsFail) {
     }
 
-    fun processSyncIn(message: PayloadMessage, payloadProcessing: PayloadProcessing?): Pair<PayloadMessage, Direction> {
+    suspend fun processSyncIn(message: PayloadMessage, payloadProcessing: PayloadProcessing?): Pair<PayloadMessage, Direction> {
         if (payloadProcessing == null) throw Exception("Processing information is missing for ${message.messageId}")
         return processMessage(message, payloadProcessing, Direction.IN)
     }
 
-    fun proccessSyncOut(payloadMessage: PayloadMessage, payloadProcessing: PayloadProcessing?): PayloadMessage {
+    suspend fun proccessSyncOut(payloadMessage: PayloadMessage, payloadProcessing: PayloadProcessing?): PayloadMessage {
         if (payloadProcessing == null) throw Exception("Processing information is missing for ${payloadMessage.messageId}")
         return processMessage(payloadMessage, payloadProcessing, Direction.OUT).first
     }
 
-    fun processAsync(message: EbmsMessage, payloadProcessing: PayloadProcessing?) {
+    suspend fun processAsync(message: EbmsMessage, payloadProcessing: PayloadProcessing?) {
         if (payloadProcessing == null) throw Exception("Processing information is missing for ${message.messageId}")
         when (message) {
             is Acknowledgment -> acknowledgment(message)

ebms-provider/src/main/kotlin/no/nav/emottak/ebms/sendin/SendInService.kt

@@ -1,6 +1,8 @@
 package no.nav.emottak.ebms.sendin
 
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withContext
 import no.nav.emottak.ebms.SendInClient
 import no.nav.emottak.ebms.model.PayloadMessage
 import no.nav.emottak.melding.model.EbmsProcessing
@@ -9,7 +11,7 @@ import no.nav.emottak.melding.model.SendInResponse
 
 class SendInService(val httpClient: SendInClient) {
 
-    fun sendIn(payloadMessage: PayloadMessage): SendInResponse {
+    suspend fun sendIn(payloadMessage: PayloadMessage): SendInResponse {
         val sendInRequest = SendInRequest(
             payloadMessage.messageId,
             payloadMessage.conversationId,
@@ -18,6 +20,6 @@ class SendInService(val httpClient: SendInClient) {
             payloadMessage.addressing,
             EbmsProcessing()
         )
-        return runBlocking { httpClient.postSendIn(sendInRequest) }
+        return withContext(Dispatchers.IO) { runBlocking { httpClient.postSendIn(sendInRequest) } }
     }
 }

ebms-provider/src/test/kotlin/no/nav/emottak/ebms/EbmsRoutFellesIT.kt

@@ -11,11 +11,11 @@ import io.ktor.server.routing.post
 import io.ktor.server.routing.routing
 import io.ktor.server.testing.ApplicationTestBuilder
 import io.ktor.server.testing.testApplication
-import io.mockk.every
+import io.mockk.coEvery
+import io.mockk.coVerify
 import io.mockk.just
 import io.mockk.mockk
 import io.mockk.runs
-import io.mockk.verify
 import no.nav.emottak.cpa.decodeBase64Mime
 import no.nav.emottak.ebms.ebxml.errorList
 import no.nav.emottak.ebms.ebxml.messageHeader
@@ -65,7 +65,7 @@ abstract class EbmsRoutFellesIT(val endpoint: String) {
         application {
             val dokumentValidator = DokumentValidator(cpaRepoClient)
 
-            every {
+            coEvery {
                 processingService.processAsync(any(), any())
             } just runs
             routing {
@@ -113,7 +113,7 @@ abstract class EbmsRoutFellesIT(val endpoint: String) {
             }
         )
         client.post("/ebms", multipart.asHttpRequest())
-        verify(exactly = 1) {
+        coVerify(exactly = 1) {
             processingService.processAsync(any(), any())
         }
     }

ebms-provider/src/test/kotlin/no/nav/emottak/ebms/EbmsRouteAsyncIT.kt

@@ -7,9 +7,9 @@ import io.ktor.client.statement.bodyAsText
 import io.ktor.http.HttpStatusCode
 import io.ktor.http.headers
 import io.ktor.server.routing.post
+import io.mockk.coVerify
 import io.mockk.every
 import io.mockk.mockkObject
-import io.mockk.verify
 import no.nav.emottak.constants.SMTPHeaders
 import no.nav.emottak.cpa.decodeBase64Mime
 import no.nav.emottak.ebms.ebxml.acknowledgment
@@ -33,7 +33,7 @@ class EbmsRouteAsyncIT : EbmsRoutFellesIT("/ebms") {
             }
         )
         val response = client.post("/ebms", multipart.asHttpRequest())
-        verify(exactly = 1) {
+        coVerify(exactly = 1) {
             processingService.processAsync(any(), any())
         }
         val envelope = xmlMarshaller.unmarshal(response.bodyAsText().decodeBase64Mime(), Envelope::class.java)

ebms-provider/src/test/kotlin/no/nav/emottak/ebms/EbmsRouteSyncIT.kt

@@ -13,9 +13,10 @@ import io.ktor.server.routing.post
 import io.ktor.server.routing.routing
 import io.ktor.server.testing.ApplicationTestBuilder
 import io.ktor.server.testing.testApplication
+import io.mockk.coEvery
+import io.mockk.coVerify
 import io.mockk.every
 import io.mockk.mockkStatic
-import io.mockk.verify
 import no.nav.emottak.constants.SMTPHeaders
 import no.nav.emottak.ebms.model.EbMSDocument
 import no.nav.emottak.ebms.model.PayloadMessage
@@ -55,12 +56,12 @@ class EbmsRouteSyncIT : EbmsRoutFellesIT(SYNC_PATH) {
         val sendInClient = SendInClient { client }
         application {
             val dokumentValidator = DokumentValidator(cpaRepoClient)
-            every {
+            coEvery {
                 processingService.processSyncIn(any(), any())
             } answers {
                 Pair(it.invocation.args[0] as PayloadMessage, Direction.IN)
             }
-            every {
+            coEvery {
                 processingService.proccessSyncOut(any(), any())
             } answers {
                 val incomingMessage = it.invocation.args[0] as PayloadMessage
@@ -137,7 +138,7 @@ class EbmsRouteSyncIT : EbmsRoutFellesIT(SYNC_PATH) {
         } returnsArgument(0)
         val multipart = TestData.HarBorderEgenAndel.harBorgerEgenanderFritakRequest
         val response = client.post(SYNC_PATH, multipart.asHttpRequest())
-        verify(exactly = 1) {
+        coVerify(exactly = 1) {
             processingService.processSyncIn(any(), any())
         }
         assert(response.status == HttpStatusCode.OK)