Skip to content

Upgrade to jakarta for xml schema, marchalling etc. #147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eivinhb merged 1 commit into from
Apr 11, 2025
Merged

Upgrade to jakarta for xml schema, marchalling etc. #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions NOTICE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,20 @@ Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.html

This software includes third party software subject to the following licenses:

Angus Activation Registries under EDL 1.0
Apache Commons Lang under Apache-2.0
Bouncy Castle Provider under Bouncy Castle Licence
Digipost JAXB Resolver - com.sun.xml.bind under The Apache Software License, Version 2.0
istack common utility code runtime under Eclipse Distribution License - v 1.0
Jakarta Activation API under EDL 1.0
JavaBeans Activation Framework API jar under CDDL/GPLv2+CE
jaxb-api under CDDL 1.1 or GPL2 w/ CPE
JAXB2 Basics - Runtime under BSD-Style License
Jakarta XML Binding API under Eclipse Distribution License - v 1.0
JAXB Core under Eclipse Distribution License - v 1.0
JAXB Runtime under Eclipse Distribution License - v 1.0
JAXB Tools :: JAXB Plugins :: Runtime under BSD-Style License
JCL 1.2 implemented over SLF4J under Apache License, Version 2.0
JUL to SLF4J bridge under MIT License
Old JAXB Core under CDDL+GPL License
Old JAXB Runtime under Eclipse Distribution License - v 1.0
SDP Shared under The Apache Software License, Version 2.0
SDP Shared - API Commons under The Apache Software License, Version 2.0
SDP Shared - XSD & JAXB under The Apache Software License, Version 2.0
SLF4J API Module under MIT License
TXW2 Runtime under Eclipse Distribution License - v 1.0

13 changes: 9 additions & 4 deletions api-commons/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>sdp-api-commons</artifactId>
<name>SDP Shared - API Commons</name>
Expand All @@ -14,13 +15,17 @@
<dependencies>

<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
</dependency>

<dependency>
<groupId>no.digipost</groupId>
Expand All @@ -37,7 +42,7 @@
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
Expand Down
9 changes: 5 additions & 4 deletions api-commons/src/main/java/no/digipost/api/xml/JaxbMarshaller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package no.digipost.api.xml;

import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
import jakarta.xml.bind.JAXBContext;
import jakarta.xml.bind.JAXBException;
import jakarta.xml.bind.Marshaller;
import jakarta.xml.bind.Unmarshaller;

import javax.xml.transform.Result;
import javax.xml.transform.Source;
import javax.xml.validation.Schema;
Expand Down
4 changes: 2 additions & 2 deletions api-commons/src/main/java/no/digipost/api/xml/Marshalling.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package no.digipost.api.xml;

import jakarta.xml.bind.JAXBElement;
import jakarta.xml.bind.JAXBException;
import no.difi.begrep.sdp.schema_v10.SDPKvittering;
import no.digipost.org.oasis_open.docs.ebxml_bp.ebbp_signals_2.NonRepudiationInformation;
import no.digipost.org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.Messaging;
Expand All @@ -9,8 +11,6 @@
import org.w3c.dom.Node;
import org.xmlsoap.schemas.soap.envelope.Envelope;

import javax.xml.bind.JAXBElement;
import javax.xml.bind.JAXBException;
import javax.xml.transform.stream.StreamSource;
import java.io.InputStream;

Expand Down
4 changes: 1 addition & 3 deletions api-commons/src/test/java/no/digipost/api/xml/UnmarshallingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
package no.digipost.api.xml;

import no.difi.begrep.sdp.schema_v10.SDPDigitalPost;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

import javax.xml.transform.stream.StreamSource;

import java.io.InputStream;

@Disabled
public class UnmarshallingTest {

@Test
public void should_unmashall_schema_valid_xml() {
public void should_unmarshall_schema_valid_xml() {
InputStream xml = getClass().getResourceAsStream("/difi2.xml");
Marshalling.getMarshallerSingleton().unmarshal(new StreamSource(xml), SDPDigitalPost.class);
}
Expand Down
191 changes: 90 additions & 101 deletions api-commons/src/test/resources/difi2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,108 +1,97 @@
<?xml version="1.0" encoding="UTF-8"?>
<digitalPost xmlns:enc="http://www.w3.org/2001/04/xmlenc#"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://begrep.difi.no/sdp/schema_v10"
xsi:schemaLocation="http://begrep.difi.no/sdp/schema_v10 /Users/gk/digipost/digipost-offentlig/xsd/src/main/difi-begrepskatalog/resources/begrep/sikkerDigitalPost/xsd/sdp-melding.xsd "
>
<digitalPost
xmlns="http://begrep.difi.no/sdp/schema_v10"
xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://begrep.difi.no/sdp/schema_v10 ../xsd/sdp-melding.xsd ">

<sdpMeldingId>31415926535987</sdpMeldingId>

<avsender>
<organisasjon>9908:123456789</organisasjon>
<avsenderidentifikator>123456789-A</avsenderidentifikator>
<fakturaReferanse>asdf</fakturaReferanse>
</avsender>
<Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
<SignedInfo>
<CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
<SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
<Reference URI="">
<Transforms>
<Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
</Transforms>
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<DigestValue>uooqbWYa5VCqcJCbuymBKqm17vY=</DigestValue>
</Reference>
</SignedInfo>
<SignatureValue xmlns="http://www.w3.org/2000/09/xmldsig#">KedJuTob5gtvYx9qM3k3gm7kbLBwVbEQRl26S2tmXjqNND7MRGtoew==</SignatureValue>
<KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
<X509Data>
<X509Certificate>
MIIElTCCA32gAwIBAgIDDUL8MA0GCSqGSIb3DQEBBQUAMEsxCzAJBgNVBAYTAk5P
MR0wGwYDVQQKDBRCdXlwYXNzIEFTLTk4MzE2MzMyNzEdMBsGA1UEAwwUQnV5cGFz
cyBDbGFzcyAzIENBIDEwHhcNMTEwNTEzMTI0MjU3WhcNMTQwNTEzMTI0MjUzWjBo
MQswCQYDVQQGEwJOTzEYMBYGA1UECgwPUE9TVEVOIE5PUkdFIEFTMREwDwYDVQQL
DAhEaWdpcG9zdDEYMBYGA1UEAwwPUE9TVEVOIE5PUkdFIEFTMRIwEAYDVQQFEwk5
ODQ2NjExODUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC68mb3nPMY
KPN+jOLJCQ8x2it9PxMh8eiZ0cr5oK7C2fPs/3ywwWpav1yQdsLc5zSMQupzmqXN
OoAirP42sO+MonAmsBbgAmJfKepQCBg5CX3qZUuId6kn7BZcPIMzTWF44wc5UrF1
TlE2Ib/1ZS05lJCyLkdqpobBBKXoh2PP3xai5hFo8i+bohhyR+RWNxDnjPyp1mMX
2bLjmD+/g/0QQM3SbwKdjmy7Ylr/2EDrAQ+S0OSjR3G0BnpRCOvhVLcXfjDM1GWq
KIWKnQYFSTMB1cSpkqk9AxMY3MNT/DwUFWOihVlWvVWGjKrTBJC7FZpIqJBchNF4
hiWv4iNI7vYfAgMBAAGjggFjMIIBXzAJBgNVHRMEAjAAMB8GA1UdIwQYMBaAFDgU
5sjwqaQD9E4+IqNb8tbgrUB0MB0GA1UdDgQWBBQQPwlTXTPvyhFL30Sf3TxwhBHM
KjAOBgNVHQ8BAf8EBAMCBLAwFQYDVR0gBA4wDDAKBghghEIBGgEDAjCBpQYDVR0f
BIGdMIGaMC+gLaArhilodHRwOi8vY3JsLmJ1eXBhc3Mubm8vY3JsL0JQQ2xhc3Mz
Q0ExLmNybDBnoGWgY4ZhbGRhcDovL2xkYXAuYnV5cGFzcy5uby9kYz1CdXlwYXNz
LGRjPU5PLENOPUJ1eXBhc3MlMjBDbGFzcyUyMDMlMjBDQSUyMDE/Y2VydGlmaWNh
dGVSZXZvY2F0aW9uTGlzdDBDBggrBgEFBQcBAQQ3MDUwMwYIKwYBBQUHMAGGJ2h0
dHA6Ly9vY3NwLmJ1eXBhc3Mubm8vb2NzcC9CUENsYXNzM0NBMTANBgkqhkiG9w0B
AQUFAAOCAQEAivJd3hg5+16QOv638JlKixMivlZjbtAj8TGDKhnB6sXBw4bNbHQS
GDVdO07JKzBeYcohiYKPSn6+6NAEhJaetwVrhZgMQxNluUSOj+KSxzVVD6NLC3ga
wswK6i3OruBvpynXViNVCTjlmQzi/4pp5NjRNFcbJrfeONZwzClmIqhJorDqhw2T
/55OBEC+FxtQ9bEFBwHT0Qrx4L+HHJP7Vkk0CLWY5Ib89PZHFke/X/ad/HEla8F3
UjKB02xxs2OKEmE0gQrn3SYjOtONfQDK377RiQPiY3eKV4CBVUcidbfqPyjY/rbZ
TaPOXIYao3VFv6RCTO80zn1qw1JqGvDgNg==
</X509Certificate>
</X509Data>
</KeyInfo>
</Signature>

<digitalPostInfo>
<virkningsdato>2014-05-17</virkningsdato>
<aapningskvittering>false</aapningskvittering>
<sikkerhetsnivaa>3</sikkerhetsnivaa>
<tittel lang="no">Hurra for 17. mai</tittel>
<varsler>
<epostVarsel>
<tekst lang="no">Viktig melding fra Staten i din digitale postkasse</tekst>
<repetisjoner>
<dagerEtter>0</dagerEtter>
<dagerEtter>7</dagerEtter>
</repetisjoner>
</epostVarsel>
<smsVarsel>
<tekst lang="no">Viktig melding fra Staten</tekst>
<repetisjoner>
<dagerEtter>1</dagerEtter>
</repetisjoner>
</smsVarsel>
</varsler>
</digitalPostInfo>
<avsender>
<organisasjon>9908:123456789</organisasjon>
<avsenderidentifikator>123456789-A</avsenderidentifikator>
<fakturaReferanse>ØK1</fakturaReferanse>
</avsender>

<dokumentpakke>
<digest>
<ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<ds:DigestValue/>
</digest>
<encryptedKey Encoding="" MimeType="" Recipient="" Type="">
<enc:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p">
<ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
</enc:EncryptionMethod>
<ds:KeyInfo Id="id0001">
<ds:KeyName>nøkkelnavn</ds:KeyName>
<X509Data>
<X509SubjectName>...</X509SubjectName>
<X509Certificate>...</X509Certificate>
</X509Data>
</ds:KeyInfo>
<enc:CipherData>
<enc:CipherValue>Zm9v</enc:CipherValue>
</enc:CipherData>
</encryptedKey>
</dokumentpakke>
<mottaker>
<person>
<personidentifikator>17051400000</personidentifikator>
<postkasseadresse>ola.nordmann#0ABC</postkasseadresse>
</person>
</mottaker>

<signatur>
<SignedInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
<CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
<SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
<Reference URI="">
<Transforms>
<Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
</Transforms>
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<DigestValue>uooqbWYa5VCqcJCbuymBKqm17vY=</DigestValue>
</Reference>
</SignedInfo>
<SignatureValue xmlns="http://www.w3.org/2000/09/xmldsig#">
KedJuTob5gtvYx9qM3k3gm7kbLBwVbEQRl26S2tmXjqNND7MRGtoew==
</SignatureValue>
<KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
<X509Data>
<X509Certificate>
MIIElTCCA32gAwIBAgIDDUL8MA0GCSqGSIb3DQEBBQUAMEsxCzAJBgNVBAYTAk5P
MR0wGwYDVQQKDBRCdXlwYXNzIEFTLTk4MzE2MzMyNzEdMBsGA1UEAwwUQnV5cGFz
cyBDbGFzcyAzIENBIDEwHhcNMTEwNTEzMTI0MjU3WhcNMTQwNTEzMTI0MjUzWjBo
MQswCQYDVQQGEwJOTzEYMBYGA1UECgwPUE9TVEVOIE5PUkdFIEFTMREwDwYDVQQL
DAhEaWdpcG9zdDEYMBYGA1UEAwwPUE9TVEVOIE5PUkdFIEFTMRIwEAYDVQQFEwk5
ODQ2NjExODUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC68mb3nPMY
KPN+jOLJCQ8x2it9PxMh8eiZ0cr5oK7C2fPs/3ywwWpav1yQdsLc5zSMQupzmqXN
OoAirP42sO+MonAmsBbgAmJfKepQCBg5CX3qZUuId6kn7BZcPIMzTWF44wc5UrF1
TlE2Ib/1ZS05lJCyLkdqpobBBKXoh2PP3xai5hFo8i+bohhyR+RWNxDnjPyp1mMX
2bLjmD+/g/0QQM3SbwKdjmy7Ylr/2EDrAQ+S0OSjR3G0BnpRCOvhVLcXfjDM1GWq
KIWKnQYFSTMB1cSpkqk9AxMY3MNT/DwUFWOihVlWvVWGjKrTBJC7FZpIqJBchNF4
hiWv4iNI7vYfAgMBAAGjggFjMIIBXzAJBgNVHRMEAjAAMB8GA1UdIwQYMBaAFDgU
5sjwqaQD9E4+IqNb8tbgrUB0MB0GA1UdDgQWBBQQPwlTXTPvyhFL30Sf3TxwhBHM
KjAOBgNVHQ8BAf8EBAMCBLAwFQYDVR0gBA4wDDAKBghghEIBGgEDAjCBpQYDVR0f
BIGdMIGaMC+gLaArhilodHRwOi8vY3JsLmJ1eXBhc3Mubm8vY3JsL0JQQ2xhc3Mz
Q0ExLmNybDBnoGWgY4ZhbGRhcDovL2xkYXAuYnV5cGFzcy5uby9kYz1CdXlwYXNz
LGRjPU5PLENOPUJ1eXBhc3MlMjBDbGFzcyUyMDMlMjBDQSUyMDE/Y2VydGlmaWNh
dGVSZXZvY2F0aW9uTGlzdDBDBggrBgEFBQcBAQQ3MDUwMwYIKwYBBQUHMAGGJ2h0
dHA6Ly9vY3NwLmJ1eXBhc3Mubm8vb2NzcC9CUENsYXNzM0NBMTANBgkqhkiG9w0B
AQUFAAOCAQEAivJd3hg5+16QOv638JlKixMivlZjbtAj8TGDKhnB6sXBw4bNbHQS
GDVdO07JKzBeYcohiYKPSn6+6NAEhJaetwVrhZgMQxNluUSOj+KSxzVVD6NLC3ga
wswK6i3OruBvpynXViNVCTjlmQzi/4pp5NjRNFcbJrfeONZwzClmIqhJorDqhw2T
/55OBEC+FxtQ9bEFBwHT0Qrx4L+HHJP7Vkk0CLWY5Ib89PZHFke/X/ad/HEla8F3
UjKB02xxs2OKEmE0gQrn3SYjOtONfQDK377RiQPiY3eKV4CBVUcidbfqPyjY/rbZ
TaPOXIYao3VFv6RCTO80zn1qw1JqGvDgNg==
</X509Certificate>
</X509Data>
</KeyInfo>
</signatur>
<digitalPostInfo>
<virkningsdato>2014-05-17</virkningsdato>
<aapningskvittering>false</aapningskvittering>
<sikkerhetsnivaa>3</sikkerhetsnivaa>
<ikkeSensitivTittel lang="no">Hurra for 17. mai</ikkeSensitivTittel>
<varsler>
<epostVarsel>
<epostadresse>ola@example.com</epostadresse>
<varslingsTekst lang="no">Viktig melding fra Staten i din digitale postkasse</varslingsTekst>
<repetisjoner>
<dagerEtter>0</dagerEtter>
<dagerEtter>7</dagerEtter>
</repetisjoner>
</epostVarsel>
<smsVarsel>
<mobiltelefonnummer>12345678</mobiltelefonnummer>
<varslingsTekst lang="no">Viktig melding fra Staten</varslingsTekst>
<repetisjoner>
<dagerEtter>1</dagerEtter>
</repetisjoner>
</smsVarsel>
</varsler>
</digitalPostInfo>

</digitalPost>
<dokumentpakkefingeravtrykk>
<ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<ds:DigestValue></ds:DigestValue>
</dokumentpakkefingeravtrykk>

</digitalPost>
Loading