flytt extension fuksjonene som manipulerer EBXML.en i egen pakke

navikt · Oct 25, 2023 · e123d03 · e123d03
1 parent ce8e3ad
commit e123d03
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 10 deletions.
diff --git a/...tlin/no/nav/emottak/ebms/model/EbmsExt.kt → ...tlin/no/nav/emottak/ebms/ebxml/EbmsExt.kt b/...tlin/no/nav/emottak/ebms/model/EbmsExt.kt → ...tlin/no/nav/emottak/ebms/ebxml/EbmsExt.kt
@@ -1,4 +1,4 @@
-package no.nav.emottak.ebms.model
+package no.nav.emottak.ebms.ebxml
 
 import org.oasis_open.committees.ebxml_msg.schema.msg_header_2_0.*
 import org.xmlsoap.schemas.soap.envelope.Envelope

diff --git a/...otlin/no/nav/emottak/ebms/MessageUtils.kt → ...av/emottak/ebms/ebxml/MessageHeaderExt.kt b/...otlin/no/nav/emottak/ebms/MessageUtils.kt → ...av/emottak/ebms/ebxml/MessageHeaderExt.kt
@@ -1,7 +1,7 @@
 /*
  * This Kotlin source file was generated by the Gradle 'init' task.
  */
-package no.nav.emottak.ebms
+package no.nav.emottak.ebms.ebxml
 
 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.MessageData

diff --git a/ebms-provider/src/main/kotlin/no/nav/emottak/ebms/model/EbMSDocument.kt b/ebms-provider/src/main/kotlin/no/nav/emottak/ebms/model/EbMSDocument.kt
@@ -16,7 +16,11 @@
 package no.nav.emottak.ebms.model
 
 import no.nav.emottak.EBMS_SERVICE_URI
-import no.nav.emottak.ebms.createResponseHeader
+import no.nav.emottak.ebms.ebxml.ackRequested
+import no.nav.emottak.ebms.ebxml.acknowledgment
+import no.nav.emottak.ebms.ebxml.createResponseHeader
+import no.nav.emottak.ebms.ebxml.errorList
+import no.nav.emottak.ebms.ebxml.messageHeader
 import no.nav.emottak.ebms.validation.SignaturValidator
 import no.nav.emottak.ebms.xml.xmlMarshaller
 import no.nav.emottak.melding.model.SignatureDetails

diff --git a/ebms-provider/src/main/kotlin/no/nav/emottak/ebms/model/EbMSError.kt b/ebms-provider/src/main/kotlin/no/nav/emottak/ebms/model/EbMSError.kt
@@ -6,6 +6,10 @@ import org.oasis_open.committees.ebxml_msg.schema.msg_header_2_0.ErrorList
 import org.oasis_open.committees.ebxml_msg.schema.msg_header_2_0.SeverityType
 
 //4.2.3.4.1 https://www.oasis-open.org/committees/ebxml-msg/documents/ebMS_v2_0.pdf#page=31
+
+
+
+
 class EbMSError {
     companion object {
         // ebXml errors

diff --git a/ebms-provider/src/main/kotlin/no/nav/emottak/ebms/model/EbMSPayloadMessage.kt b/ebms-provider/src/main/kotlin/no/nav/emottak/ebms/model/EbMSPayloadMessage.kt
@@ -2,18 +2,14 @@ package no.nav.emottak.ebms.model
 
 import no.nav.emottak.EBMS_SERVICE_URI
 import no.nav.emottak.Event
-import no.nav.emottak.ebms.createResponseHeader
+import no.nav.emottak.ebms.ebxml.createResponseHeader
+import no.nav.emottak.ebms.ebxml.getAckRequestedSigned
 import no.nav.emottak.ebms.processing.DekrypteringProcessor
 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.Acknowledgment
 import org.oasis_open.committees.ebxml_msg.schema.msg_header_2_0.ErrorList
-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.MessageData
 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.Service
-import org.oasis_open.committees.ebxml_msg.schema.msg_header_2_0.To
 import org.w3c.dom.Document
-import java.time.Instant
 import java.time.LocalDateTime
 import java.time.ZoneOffset
 import java.util.*

diff --git a/ebms-provider/src/test/kotlin/no/nav/emottak/ebms/XmlMarshallerTest.kt b/ebms-provider/src/test/kotlin/no/nav/emottak/ebms/XmlMarshallerTest.kt
@@ -3,7 +3,6 @@
  */
 package no.nav.emottak.ebms
 
-import no.nav.emottak.ebms.model.getConversationId
 import no.nav.emottak.ebms.xml.marshal
 import no.nav.emottak.ebms.xml.unmarshal
 import org.junit.jupiter.api.Assertions.assertEquals