Support multiple documents

.github/workflows/build.yml

@@ -36,7 +36,6 @@ jobs:
             TAG=${GITHUB_REF#refs/heads/}-SNAPSHOT
           fi
           echo ::set-output name=version::${TAG//\//-}
-
   deploy_snapshot:
     if: startsWith(github.ref, 'refs/heads/')
     needs: makeversion

NOTICE

@@ -8,8 +8,8 @@ Licensed under Apache 2 - http://www.apache.org/licenses/LICENSE-2.0.html
 
 This software includes third party software subject to the following licenses:
 
-  jakarta.xml.bind-api under Eclipse Distribution License - v 1.0
-  JavaBeans Activation Framework API jar under EDL 1.0
+  Jakarta Activation API jar under EDL 1.0
+  Jakarta XML Binding API under Eclipse Distribution License - v 1.0
   JAXB2 Basics - Runtime under BSD-Style License
   Posten signering - API JAXB Classes under The Apache Software License, Version 2.0
   Posten signering - API Schema under The Apache Software License, Version 2.0

jaxb/NOTICE

@@ -8,8 +8,8 @@ Licensed under Apache 2 - http://www.apache.org/licenses/LICENSE-2.0.html
 
 This software includes third party software subject to the following licenses:
 
-  jakarta.xml.bind-api under Eclipse Distribution License - v 1.0
-  JavaBeans Activation Framework API jar under EDL 1.0
+  Jakarta Activation API jar under EDL 1.0
+  Jakarta XML Binding API under Eclipse Distribution License - v 1.0
   JAXB2 Basics - Runtime under BSD-Style License
   Posten signering - API JAXB Classes under The Apache Software License, Version 2.0
 

jaxb/pom.xml

@@ -14,14 +14,22 @@
 
     <properties>
         <xsd.directory>${project.basedir}/target/generated-resources/xsd</xsd.directory>
+        <project.previousVersion>set_with_-Dproject.previousVersion=X.Y</project.previousVersion>
     </properties>
 
     <dependencyManagement>
         <dependencies>
             <dependency>
                 <groupId>org.junit</groupId>
                 <artifactId>junit-bom</artifactId>
-                <version>5.5.2</version>
+                <version>5.8.0-M1</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-framework-bom</artifactId>
+                <version>5.3.8</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -32,12 +40,12 @@
         <dependency>
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
-            <version>2.3.2</version>
+            <version>2.3.3</version>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jaxb</groupId>
             <artifactId>jaxb-runtime</artifactId>
-            <version>2.3.2</version>
+            <version>2.3.4</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -55,13 +63,11 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
-            <version>5.1.9.RELEASE</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-oxm</artifactId>
-            <version>5.2.9.RELEASE</version>
             <optional>true</optional>
         </dependency>
         <dependency>
@@ -81,9 +87,9 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>co.unruly</groupId>
+            <groupId>uk.co.probablyfine</groupId>
             <artifactId>java-8-matchers</artifactId>
-            <version>1.6</version>
+            <version>1.9</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -95,25 +101,37 @@
         <dependency>
             <groupId>nl.jqno.equalsverifier</groupId>
             <artifactId>equalsverifier</artifactId>
-            <version>3.4.3</version>
+            <version>3.6.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.javers</groupId>
+            <artifactId>javers-core</artifactId>
+            <version>6.2.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>no.digipost</groupId>
             <artifactId>digg</artifactId>
-            <version>0.24</version>
+            <version>0.30</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jcl-over-slf4j</artifactId>
-            <version>1.7.30</version>
+            <version>1.7.31</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>1.7.30</version>
+            <version>1.7.31</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.ws</groupId>
+            <artifactId>spring-xml</artifactId>
+            <version>3.1.1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -128,7 +146,7 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.1.1</version>
+                    <version>3.3.0</version>
                     <configuration>
                         <excludePackageNames>no.digipost.signature.api.xml.*</excludePackageNames>
                         <detectOfflineLinks>false</detectOfflineLinks>
@@ -142,6 +160,32 @@
                         <noticeTemplate>${project.basedir}/../src/notice/NOTICE.template</noticeTemplate>
                     </configuration>
                 </plugin>
+                <plugin>
+                    <groupId>com.github.siom79.japicmp</groupId>
+                    <artifactId>japicmp-maven-plugin</artifactId>
+                    <version>0.15.3</version>
+                    <configuration>
+                        <oldVersion>
+                            <dependency>
+                                <groupId>${project.groupId}</groupId>
+                                <artifactId>${project.artifactId}</artifactId>
+                                <version>${project.previousVersion}</version>
+                            </dependency>
+                        </oldVersion>
+                        <newVersion>
+                            <file>
+                                <path>${project.build.directory}/${project.build.finalName}.${project.packaging}</path>
+                            </file>
+                        </newVersion>
+                        <parameter>
+                            <onlyModified>true</onlyModified>
+                            <onlyBinaryIncompatible>true</onlyBinaryIncompatible>
+                            <includes>
+                                <include>no.digipost.signature</include>
+                            </includes>
+                        </parameter>
+                    </configuration>
+                </plugin>
             </plugins>
         </pluginManagement>
         <plugins>
@@ -228,7 +272,7 @@
                         <plugin>
                             <groupId>org.apache.cxf.xjcplugins</groupId>
                             <artifactId>cxf-xjc-javadoc</artifactId>
-                            <version>3.3.0</version>
+                            <version>3.3.1</version>
                         </plugin>
                         <plugin>
                             <groupId>com.github.jaxb-xew-plugin</groupId>

jaxb/src/main/java/no/digipost/signature/api/xml/JobInformation.java

@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) Posten Norge AS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package no.digipost.signature.api.xml;
+
+import java.util.Optional;
+
+import static java.util.Objects.requireNonNull;
+
+public final class JobInformation {
+
+    private final String title;
+    private final Optional<String> nonSensitiveTitle;
+    private final Optional<String> description;
+
+    public JobInformation(String title, String nonSensitiveTitle, String description) {
+        this.title = requireNonNull(title, "title");
+        this.nonSensitiveTitle = Optional.ofNullable(nonSensitiveTitle);
+        this.description = Optional.ofNullable(description);
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public Optional<String> getNonSensitiveTitle() {
+        return nonSensitiveTitle;
+    }
+
+    public Optional<String> getDescription() {
+        return description;
+    }
+
+}

jaxb/src/main/java/no/digipost/signature/api/xml/MultipleDocumentsManifestWithLegacySingleDocumentSupport.java

@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) Posten Norge AS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package no.digipost.signature.api.xml;
+
+import java.util.List;
+
+import static java.util.Arrays.asList;
+
+interface MultipleDocumentsManifestWithLegacySingleDocumentSupport extends XMLManifest {
+
+    @Override
+    @SuppressWarnings("deprecation")
+    default JobInformation getJobInformation() {
+        no.digipost.signature.api.xml.legacy.XMLLegacyDocument singleDocument = getDocument();
+        if (singleDocument != null) {
+            return new JobInformation(singleDocument.getTitle(), singleDocument.getNonsensitiveTitle(), singleDocument.getDescription());
+        } else {
+            return new JobInformation(getTitle(), getNonsensitiveTitle(), getDescription());
+        }
+    }
+
+    @Override
+    default List<? extends XMLDocument> getDocumentsToSign() {
+        XMLDocument singleDocument = getDocument();
+        return singleDocument != null ? asList(singleDocument) : getDocuments();
+    }
+
+    @SuppressWarnings("deprecation")
+    no.digipost.signature.api.xml.legacy.XMLLegacyDocument getDocument();
+
+    List<? extends XMLDocument> getDocuments();
+
+    String getTitle();
+
+    String getDescription();
+
+    default String getNonsensitiveTitle() {
+        return null;
+    }
+
+}

jaxb/src/main/java/no/digipost/signature/api/xml/UrlEncoding.java

@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) Posten Norge AS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package no.digipost.signature.api.xml;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+
+final class UrlEncoding {
+
+    public static String decodeIfEncoded(String s) {
+        try {
+            return URLDecoder.decode(s, "UTF-8");
+        } catch (IllegalArgumentException notUrlEncoded) {
+            // illegal characters encountered while decoding, thus treating it as a
+            // non-encoded string, as an encoded string would not contain illegal characters.
+            return s;
+        } catch (UnsupportedEncodingException utf8NotSupported) {
+            throw new RuntimeException(utf8NotSupported.getMessage(), utf8NotSupported);
+        }
+    }
+
+    public static String encode(String s) {
+        try {
+            return URLEncoder.encode(s, "UTF-8");
+        } catch (UnsupportedEncodingException utf8NotSupported) {
+            throw new RuntimeException(utf8NotSupported.getMessage(), utf8NotSupported);
+        }
+    }
+
+}

jaxb/src/main/java/no/digipost/signature/api/xml/XMLDirectSignerStatusValue.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (C) Posten Norge AS
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

jaxb/src/main/java/no/digipost/signature/api/xml/XMLDocument.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (C) Posten Norge AS
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,8 +18,7 @@
 public interface XMLDocument {
 
 	String getTitle();
-	String getDescription();
-	String getHref();
-	String getMime();
+	XMLHref getHref();
+	String getMediaType();
 
 }