Støtt opprettelse av signeringsjobber med flere dokumenter

NOTICE

@@ -12,13 +12,12 @@ This software includes third party software subject to the following licenses:
   Apache Commons Lang under Apache License, Version 2.0
   Apache HttpClient under Apache License, Version 2.0
   Apache HttpCore under Apache License, Version 2.0
-  Extended StAX API under Eclipse Distribution License - v 1.0
-  fastinfoset under Apache License, Version 2.0 or Eclipse Distribution License - v 1.0
   istack common utility code runtime under Eclipse Distribution License - v 1.0
+  Jakarta Activation under EDL 1.0
+  Jakarta Activation API jar under EDL 1.0
   Jakarta Annotations API under EPL 2.0 or GPL2 w/ CPE
+  Jakarta XML Binding API under Eclipse Distribution License - v 1.0
   jakarta.ws.rs-api under EPL 2.0 or GPL2 w/ CPE
-  jakarta.xml.bind-api under Eclipse Distribution License - v 1.0
-  JavaBeans Activation Framework API jar under EDL 1.0
   javax.inject:1 as OSGi bundle under EPL 2.0 or GPL2 w/ CPE
   JAXB Runtime under Eclipse Distribution License - v 1.0
   JAXB2 Basics - Runtime under BSD-Style License

pom.xml

@@ -17,30 +17,30 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <project.previousVersion>set_with_-Dproject.previousVersion=X.Y</project.previousVersion>
-        <signature.api.version>2.7</signature.api.version>
-        <slf4j.version>1.7.30</slf4j.version>
+        <signature.api.version>2.8</signature.api.version>
+        <slf4j.version>1.7.31</slf4j.version>
     </properties>
 
     <dependencyManagement>
         <dependencies>
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-framework-bom</artifactId>
-                <version>5.3.3</version>
+                <version>5.3.8</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.glassfish.jersey</groupId>
                 <artifactId>jersey-bom</artifactId>
-                <version>2.33</version>
+                <version>2.34</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.junit</groupId>
                 <artifactId>junit-bom</artifactId>
-                <version>5.7.0</version>
+                <version>5.8.0-M1</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -88,7 +88,7 @@
         <dependency>
             <groupId>org.glassfish.jaxb</groupId>
             <artifactId>jaxb-runtime</artifactId>
-            <version>2.3.2</version>
+            <version>2.3.4</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
@@ -106,7 +106,7 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.8.0</version>
+            <version>2.10.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -125,12 +125,12 @@
         <dependency>
             <groupId>org.springframework.ws</groupId>
             <artifactId>spring-xml</artifactId>
-            <version>3.0.10.RELEASE</version>
+            <version>3.1.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.11</version>
+            <version>3.12.0</version>
         </dependency>
 
         <dependency>
@@ -170,7 +170,7 @@
         <dependency>
             <groupId>nl.jqno.equalsverifier</groupId>
             <artifactId>equalsverifier</artifactId>
-            <version>3.5.2</version>
+            <version>3.6.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -194,7 +194,7 @@
         <dependency>
             <groupId>no.digipost</groupId>
             <artifactId>digg</artifactId>
-            <version>0.25</version>
+            <version>0.30</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -227,12 +227,12 @@
                         <dependency>
                             <groupId>org.glassfish.jaxb</groupId>
                             <artifactId>jaxb-runtime</artifactId>
-                            <version>2.3.2</version>
+                            <version>2.3.4</version>
                         </dependency>
                         <dependency>
                             <groupId>jakarta.xml.bind</groupId>
                             <artifactId>jakarta.xml.bind-api</artifactId>
-                            <version>2.3.2</version>
+                            <version>2.3.3</version>
                         </dependency>
                     </dependencies>
                 </plugin>
@@ -243,7 +243,7 @@
                 <plugin>
                     <groupId>com.github.siom79.japicmp</groupId>
                     <artifactId>japicmp-maven-plugin</artifactId>
-                    <version>0.15.2</version>
+                    <version>0.15.3</version>
                     <configuration>
                         <oldVersion>
                             <dependency>
@@ -271,7 +271,7 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>3.0.0-M4</version>
+                    <version>3.0.0-M5</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-deploy-plugin</artifactId>
@@ -283,23 +283,23 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-dependency-plugin</artifactId>
-                    <version>3.1.1</version>
+                    <version>3.1.2</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-install-plugin</artifactId>
                     <version>3.0.0-M1</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-resources-plugin</artifactId>
-                    <version>3.1.0</version>
+                    <version>3.2.0</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-site-plugin</artifactId>
-                    <version>3.8.2</version>
+                    <version>3.9.1</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.1.1</version>
+                    <version>3.2.0</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-jar-plugin</artifactId>
@@ -331,7 +331,7 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>versions-maven-plugin</artifactId>
-                    <version>2.7</version>
+                    <version>2.8.1</version>
                 </plugin>
             </plugins>
         </pluginManagement>

src/main/java/no/digipost/signature/client/asice/ASiCEAttachable.java

@@ -5,15 +5,19 @@
 import static org.apache.commons.codec.digest.DigestUtils.sha256;
 
 public interface ASiCEAttachable extends SignableFileReference {
+
+    public static final String XML_MEDIATYPE = "application/xml";
+
     @Override
     String getFileName();
 
-    byte[] getBytes();
+    byte[] getContent();
 
-    String getMimeType();
+    @Override
+    String getMediaType();
 
     @Override
     default byte[] getSha256() {
-        return sha256(getBytes());
+        return sha256(getContent());
     }
 }

src/main/java/no/digipost/signature/client/asice/CreateASiCE.java

@@ -43,8 +43,7 @@ public DocumentBundle createASiCE(JOB job) {
 
         Manifest manifest = manifestCreator.createManifest(job, sender);
 
-        List<ASiCEAttachable> files = new ArrayList<>();
-        files.add(job.getDocument());
+        List<ASiCEAttachable> files = new ArrayList<>(job.getDocuments());
         files.add(manifest);
 
         Signature signature = createSignature.createSignature(files, keyStoreConfig);

src/main/java/no/digipost/signature/client/asice/archive/CreateZip.java

@@ -16,9 +16,9 @@ public byte[] zipIt(final List<ASiCEAttachable> files) {
             try (ZipOutputStream zipOutputStream = new ZipOutputStream(archive)) {
                 for (ASiCEAttachable file : files) {
                     ZipEntry zipEntry = new ZipEntry(file.getFileName());
-                    zipEntry.setSize(file.getBytes().length);
+                    zipEntry.setSize(file.getContent().length);
                     zipOutputStream.putNextEntry(zipEntry);
-                    zipOutputStream.write(file.getBytes());
+                    zipOutputStream.write(file.getContent());
                     zipOutputStream.closeEntry();
                 }
             }

src/main/java/no/digipost/signature/client/asice/manifest/CreateDirectManifest.java

@@ -3,25 +3,25 @@
 import no.digipost.signature.api.xml.XMLDirectDocument;
 import no.digipost.signature.api.xml.XMLDirectSignatureJobManifest;
 import no.digipost.signature.api.xml.XMLDirectSigner;
+import no.digipost.signature.api.xml.XMLHref;
 import no.digipost.signature.api.xml.XMLSender;
 import no.digipost.signature.client.core.AuthenticationLevel;
 import no.digipost.signature.client.core.IdentifierInSignedDocuments;
 import no.digipost.signature.client.core.OnBehalfOf;
 import no.digipost.signature.client.core.Sender;
 import no.digipost.signature.client.core.SignatureType;
-import no.digipost.signature.client.direct.DirectDocument;
 import no.digipost.signature.client.direct.DirectJob;
 import no.digipost.signature.client.direct.DirectSigner;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import static java.util.stream.Collectors.toList;
+
 public class CreateDirectManifest extends ManifestCreator<DirectJob> {
 
     @Override
     Object buildXmlManifest(DirectJob job, Sender sender) {
-        DirectDocument document = job.getDocument();
-
         List<XMLDirectSigner> signers = new ArrayList<>();
         for (DirectSigner signer : job.getSigners()) {
             XMLDirectSigner xmlSigner = new XMLDirectSigner()
@@ -39,13 +39,14 @@ Object buildXmlManifest(DirectJob job, Sender sender) {
                 .withSigners(signers)
                 .withRequiredAuthentication(job.getRequiredAuthentication().map(AuthenticationLevel::getXmlEnumValue).orElse(null))
                 .withSender(new XMLSender().withOrganizationNumber(sender.getOrganizationNumber()))
-                .withDocument(new XMLDirectDocument()
-                        .withTitle(document.getTitle())
-                        .withDescription(document.getMessage())
-                        .withHref(document.getFileName())
-                        .withMime(document.getMimeType())
-                )
-                .withIdentifierInSignedDocuments(job.getIdentifierInSignedDocuments().map(IdentifierInSignedDocuments::getXmlEnumValue).orElse(null))
-                ;
+                .withTitle(job.getTitle())
+                .withDescription(job.getDescription().orElse(null))
+                .withDocuments(job.getDocuments().stream()
+                        .map(document -> new XMLDirectDocument()
+                                    .withTitle(document.getTitle())
+                                    .withHref(XMLHref.of(document.getFileName()))
+                                    .withMediaType(document.getMediaType()))
+                        .collect(toList()))
+                .withIdentifierInSignedDocuments(job.getIdentifierInSignedDocuments().map(IdentifierInSignedDocuments::getXmlEnumValue).orElse(null));
     }
 }

src/main/java/no/digipost/signature/client/asice/manifest/CreatePortalManifest.java

@@ -3,6 +3,7 @@
 import no.digipost.signature.api.xml.XMLAvailability;
 import no.digipost.signature.api.xml.XMLEmail;
 import no.digipost.signature.api.xml.XMLEnabled;
+import no.digipost.signature.api.xml.XMLHref;
 import no.digipost.signature.api.xml.XMLNotifications;
 import no.digipost.signature.api.xml.XMLNotificationsUsingLookup;
 import no.digipost.signature.api.xml.XMLPortalDocument;
@@ -17,15 +18,16 @@
 import no.digipost.signature.client.core.SignatureType;
 import no.digipost.signature.client.portal.Notifications;
 import no.digipost.signature.client.portal.NotificationsUsingLookup;
-import no.digipost.signature.client.portal.PortalDocument;
 import no.digipost.signature.client.portal.PortalJob;
 import no.digipost.signature.client.portal.PortalSigner;
 
 import java.time.Clock;
+import java.time.Duration;
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
+import static java.util.stream.Collectors.toList;
 import static no.digipost.signature.client.core.exceptions.SignerNotSpecifiedException.SIGNER_NOT_SPECIFIED;
 
 public class CreatePortalManifest extends ManifestCreator<PortalJob> {
@@ -41,7 +43,6 @@ Object buildXmlManifest(PortalJob job, Sender sender) {
         List<XMLPortalSigner> xmlSigners = new ArrayList<>();
         for (PortalSigner signer : job.getSigners()) {
             XMLPortalSigner xmlPortalSigner = generateSigner(signer);
-
             if (signer.getNotifications() != null) {
                 xmlPortalSigner.setNotifications(generateNotifications(signer.getNotifications()));
             } else if (signer.getNotificationsUsingLookup() != null) {
@@ -50,27 +51,25 @@ Object buildXmlManifest(PortalJob job, Sender sender) {
             xmlSigners.add(xmlPortalSigner);
         }
 
-        PortalDocument document = job.getDocument();
-
         ZonedDateTime activationTime = job.getActivationTime().map(activation -> activation.atZone(clock.getZone())).orElse(null);
 
         return new XMLPortalSignatureJobManifest()
                 .withSigners(xmlSigners)
                 .withRequiredAuthentication(job.getRequiredAuthentication().map(AuthenticationLevel::getXmlEnumValue).orElse(null))
                 .withSender(new XMLSender().withOrganizationNumber(sender.getOrganizationNumber()))
-                .withDocument(new XMLPortalDocument()
-                        .withTitle(document.getTitle())
-                        .withNonsensitiveTitle(document.getNonsensitiveTitle())
-                        .withDescription(document.getMessage())
-                        .withHref(document.getFileName())
-                        .withMime(document.getMimeType())
-                )
+                .withTitle(job.getTitle())
+                .withNonsensitiveTitle(job.getNonsensitiveTitle().orElse(null))
+                .withDescription(job.getDescription().orElse(null))
+                .withDocuments(job.getDocuments().stream()
+                        .map(document -> new XMLPortalDocument()
+                                    .withTitle(document.getTitle())
+                                    .withHref(XMLHref.of(document.getFileName()))
+                                    .withMediaType(document.getMediaType()))
+                        .collect(toList()))
                 .withAvailability(new XMLAvailability()
                         .withActivationTime(activationTime)
-                        .withAvailableSeconds(job.getAvailableSeconds())
-                )
-                .withIdentifierInSignedDocuments(job.getIdentifierInSignedDocuments().map(IdentifierInSignedDocuments::getXmlEnumValue).orElse(null))
-                ;
+                        .withAvailableSeconds(job.getAvailable().map(Duration::getSeconds).orElse(null)))
+                .withIdentifierInSignedDocuments(job.getIdentifierInSignedDocuments().map(IdentifierInSignedDocuments::getXmlEnumValue).orElse(null));
     }
 
     private XMLPortalSigner generateSigner(PortalSigner signer) {

src/main/java/no/digipost/signature/client/asice/manifest/Manifest.java

@@ -16,12 +16,13 @@ public String getFileName() {
     }
 
     @Override
-    public byte[] getBytes() {
+    public byte[] getContent() {
         return xmlBytes;
     }
 
     @Override
-    public String getMimeType() {
-        return "application/xml";
+    public String getMediaType() {
+        return XML_MEDIATYPE;
     }
+
 }

src/main/java/no/digipost/signature/client/asice/signature/CreateSignature.java

@@ -169,8 +169,9 @@ private List<Reference> references(final XMLSignatureFactory xmlSignatureFactory
         for (int i = 0; i < files.size(); i++) {
             try {
                 String signatureElementId = "ID_" + i;
-                String uri = URLEncoder.encode(files.get(i).getFileName(), "UTF-8");
-                Reference reference = xmlSignatureFactory.newReference(uri, sha256DigestMethod, null, null, signatureElementId, files.get(i).getSha256());
+                SignableFileReference file = files.get(i);
+                String uri = URLEncoder.encode(file.getFileName(), "UTF-8");
+                Reference reference = xmlSignatureFactory.newReference(uri, sha256DigestMethod, null, null, signatureElementId, file.getSha256());
                 result.add(reference);
             } catch(UnsupportedEncodingException e) {
                 throw new RuntimeException(e);

src/main/java/no/digipost/signature/client/asice/signature/CreateXAdESArtifacts.java

@@ -60,7 +60,7 @@ private List<DataObjectFormat> dataObjectFormats(List<? extends SignableFileRefe
         List<DataObjectFormat> result = new ArrayList<>();
         for (int i = 0; i < files.size(); i++) {
             String signatureElementIdReference = format("#ID_%s", i);
-            result.add(new DataObjectFormat(null, null, files.get(i).getMimeType(), null, signatureElementIdReference));
+            result.add(new DataObjectFormat(null, null, files.get(i).getMediaType(), null, signatureElementIdReference));
         }
         return result;
     }

src/main/java/no/digipost/signature/client/asice/signature/SignableFileReference.java

@@ -6,6 +6,6 @@ public interface SignableFileReference {
 
     byte[] getSha256();
 
-    String getMimeType();
+    String getMediaType();
 
 }