Fix getmessageId

navikt · Sep 22, 2023 · e65191e · e65191e
1 parent 21465dc
commit e65191e
Showing 1 changed file with 7 additions and 10 deletions.
diff --git a/ebms-provider/src/main/kotlin/no/nav/emottak/ebms/model/EbmsExt.kt b/ebms-provider/src/main/kotlin/no/nav/emottak/ebms/model/EbmsExt.kt
@@ -1,10 +1,7 @@
 package no.nav.emottak.ebms.model
 
 import org.apache.commons.lang3.StringUtils.isNotBlank
-import org.oasis_open.committees.ebxml_msg.schema.msg_header_2_0.AckRequested
-import org.oasis_open.committees.ebxml_msg.schema.msg_header_2_0.From
-import org.oasis_open.committees.ebxml_msg.schema.msg_header_2_0.Manifest
-import org.oasis_open.committees.ebxml_msg.schema.msg_header_2_0.MessageHeader
+import org.oasis_open.committees.ebxml_msg.schema.msg_header_2_0.*
 import org.xmlsoap.schemas.soap.envelope.Envelope
 
 // TODO kan sikkert flytte alt dette til der det brukes.
@@ -27,18 +24,18 @@ fun Envelope.getFrom (): From {
     return (this.header.any.find { it is MessageHeader } as MessageHeader).from
 }
 
-fun Envelope.getMessageId(): String {
-    return this.header.any.filterIsInstance<MessageHeader>()
-        .stream().filter { isNotBlank(it.id) }
-        .map { it.id }.findFirst().get()
-}
-
 fun Envelope.getVersion(): String {
     return this.header.any.filterIsInstance<MessageHeader>()
         .stream().filter { isNotBlank(it.version) }
         .map { it.version }.findFirst().get()
 }
 
+fun Envelope.getMessageId(): String {
+    return this.header.any.filterIsInstance<MessageData>()
+        .stream().filter { isNotBlank(it.messageId) }
+        .map { it.messageId }.findFirst().get()
+}
+
 fun Envelope.getActor(): String {
     return this.header.any.filterIsInstance<AckRequested>().stream()
         .filter{ isNotBlank(it.actor) }.map { it.actor }.findFirst().get()