Added namespace prefix mapper for ebxml envelope xsds (#195)

* Added namespace prefix mapper for ebxml envelope xsds

* Fix default prefix values

* Update prefixmapper property for jakarta

---------

Co-authored-by: Thomas Burnett <[email protected]>

Author: thburnett

ebxml-processing-model/build.gradle.kts

@@ -55,6 +55,7 @@ dependencies {
     implementation(libs.emottak.payload.xsd)
     implementation(libs.emottak.utils)
     implementation(libs.ktor.serialization.kotlinx.json)
+    implementation(libs.jaxb.runtime)
     implementation(libs.bundles.logging)
     runtimeOnly("org.postgresql:postgresql:42.7.3")
 }

ebxml-processing-model/src/main/kotlin/no/nav/emottak/message/xml/XmlMarshaller.kt

@@ -2,6 +2,8 @@ package no.nav.emottak.message.xml
 
 import jakarta.xml.bind.JAXBContext
 import jakarta.xml.bind.JAXBElement
+import jakarta.xml.bind.Marshaller
+import org.glassfish.jaxb.runtime.marshaller.NamespacePrefixMapper
 import org.w3c.dom.Document
 import org.w3c.dom.Node
 import org.xmlsoap.schemas.soap.envelope.Envelope
@@ -23,12 +25,13 @@ class XmlMarshaller {
             org.oasis_open.committees.ebxml_msg.schema.msg_header_2_0.ObjectFactory::class.java,
             org.xmlsoap.schemas.soap.envelope.ObjectFactory::class.java,
             org.w3._1999.xlink.ObjectFactory::class.java,
-            org.w3._2009.xmldsig11_.ObjectFactory::class.java,
-            no.kith.xmlstds.msghead._2006_05_24.ObjectFactory::class.java,
-            no.nav.tjeneste.ekstern.frikort.v1.types.ObjectFactory::class.java
+            org.w3._2009.xmldsig11_.ObjectFactory::class.java
         )
 
-        private val marshaller = jaxbContext.createMarshaller()
+        private val marshaller = jaxbContext.createMarshaller().apply {
+            setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true)
+            setProperty("org.glassfish.jaxb.namespacePrefixMapper", EbXMLNamespacePrefixMapper())
+        }
         private val unmarshaller = jaxbContext.createUnmarshaller()
         private val marshlingMonitor = Any()
         private val unmarshlingMonitor = Any()
@@ -64,3 +67,25 @@ class XmlMarshaller {
         return if (unmarshalled is JAXBElement<*>) (unmarshalled as JAXBElement<T>).value else unmarshalled as T
     }
 }
+
+class EbXMLNamespacePrefixMapper : NamespacePrefixMapper() {
+    private val namespaceMap = mapOf(
+        "http://www.oasis-open.org/committees/ebxml-msg/schema/msg-header-2_0.xsd" to "eb",
+        "http://www.oasis-open.org/committees/ebxml-cppa/schema/cpp-cpa-2_0.xsd" to "cppa",
+        "http://www.w3.org/2000/09/xmldsig#" to "ds",
+        "http://www.w3.org/1999/xlink" to "xlink",
+        "http://schemas.xmlsoap.org/soap/envelope/" to "SOAP"
+    )
+
+    private val assignedPrefixes = mutableMapOf<String, String>()
+    private var prefixCounter = 1
+
+    override fun getPreferredPrefix(namespaceUri: String?, suggestion: String?, requirePrefix: Boolean): String {
+        if (namespaceUri == null) return "ns0"
+        return namespaceMap[namespaceUri]
+            ?: assignedPrefixes[namespaceUri]
+            ?: "ns${prefixCounter++}".also {
+                assignedPrefixes[namespaceUri] = it
+            }
+    }
+}