DD4J-476 Initial update of DSS to version 5.5.d4j.1

open-eid · Oct 21, 2019 · 0e35a5c · 0e35a5c
1 parent 3f6e136
commit 0e35a5c
Show file tree

Hide file tree

Showing 154 changed files with 1,155 additions and 713 deletions.
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/ddoc4j/pom.xml b/ddoc4j/pom.xml
@@ -6,7 +6,7 @@
     <groupId>org.digidoc4j</groupId>
     <artifactId>ddoc4j</artifactId>
     <packaging>jar</packaging>
-    <version>3.3.0</version>
+    <version>4.0.0-SNAPSHOT</version>
 
     <name>DDoc4J</name>
     <description>DDoc4J is Java Library for validating DDOC documents. It's not recommended to use it directly but rather through DigiDoc4J's API.</description>
@@ -15,7 +15,7 @@
     <parent>
         <artifactId>digidoc4j-parent</artifactId>
         <groupId>org.digidoc4j</groupId>
-        <version>3.3.0</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>

diff --git a/digidoc4j/pom.xml b/digidoc4j/pom.xml
@@ -7,7 +7,7 @@
     <groupId>org.digidoc4j</groupId>
     <artifactId>digidoc4j</artifactId>
     <packaging>jar</packaging>
-    <version>3.3.0</version>
+    <version>4.0.0-SNAPSHOT</version>
 
     <name>DigiDoc4j</name>
     <description>DigiDoc4j is a Java library for digitally signing documents and creating digital signature containers
@@ -18,14 +18,14 @@
     <parent>
         <artifactId>digidoc4j-parent</artifactId>
         <groupId>org.digidoc4j</groupId>
-        <version>3.3.0</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <properties>
         <logback-classic.version>1.2.3</logback-classic.version>
         <junit.version>4.12</junit.version>
         <dss.groupId>org.digidoc4j.dss</dss.groupId>
-        <dss.version>5.4.d4j.1</dss.version>
+        <dss.version>5.5.d4j.1</dss.version>
         <dss.util.build>${project.build.directory}/build/util</dss.util.build>
         <dss.util.lib>${project.build.directory}/library/util</dss.util.lib>
         <dss.zip.lib>${project.build.directory}/library/zip</dss.zip.lib>
@@ -43,7 +43,7 @@
         <dependency>
             <artifactId>ddoc4j</artifactId>
             <groupId>org.digidoc4j</groupId>
-            <version>3.3.0</version>
+            <version>4.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -120,11 +120,6 @@
             <artifactId>log4j-over-slf4j</artifactId>
             <version>${slf4j.version}</version>
         </dependency>
-        <dependency>
-            <groupId>${dss.groupId}</groupId>
-            <artifactId>dss-common-validation-jaxb</artifactId>
-            <version>${dss.version}</version>
-        </dependency>
         <dependency>
             <groupId>${dss.groupId}</groupId>
             <artifactId>dss-detailed-report-jaxb</artifactId>
@@ -150,11 +145,6 @@
             <artifactId>dss-policy-jaxb</artifactId>
             <version>${dss.version}</version>
         </dependency>
-        <dependency>
-            <groupId>${dss.groupId}</groupId>
-            <artifactId>dss-reports</artifactId>
-            <version>${dss.version}</version>
-        </dependency>
         <dependency>
             <groupId>${dss.groupId}</groupId>
             <artifactId>dss-service</artifactId>
@@ -175,11 +165,6 @@
             <artifactId>dss-token</artifactId>
             <version>${dss.version}</version>
         </dependency>
-        <dependency>
-            <groupId>${dss.groupId}</groupId>
-            <artifactId>dss-tsl-jaxb</artifactId>
-            <version>${dss.version}</version>
-        </dependency>
         <dependency>
             <groupId>${dss.groupId}</groupId>
             <artifactId>dss-tsl-validation</artifactId>

diff --git a/digidoc4j/src/main/java/org/digidoc4j/CertificateValidator.java b/digidoc4j/src/main/java/org/digidoc4j/CertificateValidator.java
@@ -4,7 +4,7 @@
 
 import org.digidoc4j.exceptions.CertificateValidationException;
 
-import eu.europa.esig.dss.x509.CertificateSource;
+import eu.europa.esig.dss.spi.x509.CertificateSource;
 
 /**
  * Created by Janar Rahumeel (CGI Estonia)

diff --git a/digidoc4j/src/main/java/org/digidoc4j/CertificateValidatorBuilder.java b/digidoc4j/src/main/java/org/digidoc4j/CertificateValidatorBuilder.java
@@ -7,9 +7,9 @@
 import org.digidoc4j.impl.CommonOCSPCertificateSource;
 import org.digidoc4j.impl.OCSPCertificateValidator;
 
-import eu.europa.esig.dss.DSSException;
+import eu.europa.esig.dss.model.DSSException;
-import eu.europa.esig.dss.x509.CertificateSource;
+import eu.europa.esig.dss.spi.x509.CertificateSource;
-import eu.europa.esig.dss.x509.ocsp.OCSPSource;
+import eu.europa.esig.dss.spi.x509.revocation.ocsp.OCSPSource;
 
 /**
  * Builder for certificate validator. Currently only OCSP is supported

diff --git a/digidoc4j/src/main/java/org/digidoc4j/Configuration.java b/digidoc4j/src/main/java/org/digidoc4j/Configuration.java
@@ -10,7 +10,7 @@
 
 package org.digidoc4j;
 
-import eu.europa.esig.dss.client.http.Protocol;
+import eu.europa.esig.dss.spi.client.http.Protocol;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;

diff --git a/digidoc4j/src/main/java/org/digidoc4j/Container.java b/digidoc4j/src/main/java/org/digidoc4j/Container.java
@@ -17,7 +17,7 @@
 import java.security.cert.X509Certificate;
 import java.util.List;
 
-import eu.europa.esig.dss.MimeType;
+import eu.europa.esig.dss.model.MimeType;
 
 /**
  * Offers functionality for handling data files and signatures in a container.

diff --git a/digidoc4j/src/main/java/org/digidoc4j/ContainerBuilder.java b/digidoc4j/src/main/java/org/digidoc4j/ContainerBuilder.java
@@ -10,7 +10,7 @@
 
 package org.digidoc4j;
 
-import eu.europa.esig.dss.DigestAlgorithm;
+import eu.europa.esig.dss.enumerations.DigestAlgorithm;
 import org.apache.commons.lang3.StringUtils;
 import org.digidoc4j.exceptions.DigiDoc4JException;
 import org.digidoc4j.exceptions.InvalidDataFileException;

diff --git a/digidoc4j/src/main/java/org/digidoc4j/ContainerOpener.java b/digidoc4j/src/main/java/org/digidoc4j/ContainerOpener.java
@@ -10,7 +10,7 @@
 
 package org.digidoc4j;
 
-import eu.europa.esig.dss.MimeType;
+import eu.europa.esig.dss.model.MimeType;
 import org.digidoc4j.exceptions.DigiDoc4JException;
 import org.digidoc4j.impl.asic.AsicFileContainerParser;
 import org.digidoc4j.impl.asic.AsicParseResult;

diff --git a/digidoc4j/src/main/java/org/digidoc4j/DataFile.java b/digidoc4j/src/main/java/org/digidoc4j/DataFile.java
@@ -10,14 +10,14 @@
 
 package org.digidoc4j;
 
-import eu.europa.esig.dss.DSSDocument;
+import eu.europa.esig.dss.model.DSSDocument;
-import eu.europa.esig.dss.DSSException;
+import eu.europa.esig.dss.model.DSSException;
-import eu.europa.esig.dss.DSSUtils;
+import eu.europa.esig.dss.spi.DSSUtils;
-import eu.europa.esig.dss.Digest;
+import eu.europa.esig.dss.model.Digest;
-import eu.europa.esig.dss.DigestAlgorithm;
+import eu.europa.esig.dss.enumerations.DigestAlgorithm;
-import eu.europa.esig.dss.FileDocument;
+import eu.europa.esig.dss.model.FileDocument;
-import eu.europa.esig.dss.InMemoryDocument;
+import eu.europa.esig.dss.model.InMemoryDocument;
-import eu.europa.esig.dss.MimeType;
+import eu.europa.esig.dss.model.MimeType;
 import org.apache.commons.io.IOUtils;
 import org.digidoc4j.exceptions.DigiDoc4JException;
 import org.digidoc4j.exceptions.InvalidDataFileException;

diff --git a/digidoc4j/src/main/java/org/digidoc4j/DetachedXadesSignatureBuilder.java b/digidoc4j/src/main/java/org/digidoc4j/DetachedXadesSignatureBuilder.java
@@ -10,8 +10,8 @@
 
 package org.digidoc4j;
 
-import eu.europa.esig.dss.InMemoryDocument;
+import eu.europa.esig.dss.model.InMemoryDocument;
-import eu.europa.esig.dss.Policy;
+import eu.europa.esig.dss.model.Policy;
 import org.digidoc4j.exceptions.DataFileMissingException;
 import org.digidoc4j.exceptions.InvalidSignatureException;
 import org.digidoc4j.exceptions.NotSupportedException;
@@ -153,7 +153,7 @@ public DetachedXadesSignatureBuilder withRoles(String... roles) {
    * @return builder for creating a signature.
    */
   public DetachedXadesSignatureBuilder withSignatureId(String signatureId) {
-    signatureParameters.setSignatureId(signatureId);
+    signatureParameters.setXmlDigitalSignatureId(signatureId);
     return this;
   }
 

diff --git a/digidoc4j/src/main/java/org/digidoc4j/DigestAlgorithm.java b/digidoc4j/src/main/java/org/digidoc4j/DigestAlgorithm.java
@@ -55,8 +55,8 @@ public byte[] digestInfoPrefix() {
     return digestInfoPrefix;
   }
 
-  public eu.europa.esig.dss.DigestAlgorithm getDssDigestAlgorithm() {
+  public eu.europa.esig.dss.enumerations.DigestAlgorithm getDssDigestAlgorithm() {
-    return eu.europa.esig.dss.DigestAlgorithm.forXML(uri.toString());
+    return eu.europa.esig.dss.enumerations.DigestAlgorithm.forXML(uri.toString());
   }
 
   /**

diff --git a/digidoc4j/src/main/java/org/digidoc4j/DigestDataFile.java b/digidoc4j/src/main/java/org/digidoc4j/DigestDataFile.java
@@ -7,8 +7,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import eu.europa.esig.dss.DigestDocument;
+import eu.europa.esig.dss.model.DigestDocument;
-import eu.europa.esig.dss.MimeType;
+import eu.europa.esig.dss.model.MimeType;
 
 public class DigestDataFile extends DataFile {
 

diff --git a/digidoc4j/src/main/java/org/digidoc4j/ExtendedCertificateSource.java b/digidoc4j/src/main/java/org/digidoc4j/ExtendedCertificateSource.java
@@ -3,7 +3,7 @@
 import java.io.FileFilter;
 import java.nio.file.Path;
 
-import eu.europa.esig.dss.x509.CertificateSource;
+import eu.europa.esig.dss.spi.x509.CertificateSource;
 
 /**
  * Created by Janar Rahumeel (CGI Estonia)

diff --git a/digidoc4j/src/main/java/org/digidoc4j/LargeDataFile.java b/digidoc4j/src/main/java/org/digidoc4j/LargeDataFile.java
@@ -17,7 +17,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import eu.europa.esig.dss.DSSDocument;
+import eu.europa.esig.dss.model.DSSDocument;
 
 /**
  * Handling large files from a stream to be stored temporarily on disk.

diff --git a/digidoc4j/src/main/java/org/digidoc4j/OCSPSourceBuilder.java b/digidoc4j/src/main/java/org/digidoc4j/OCSPSourceBuilder.java
@@ -10,7 +10,7 @@
 
 package org.digidoc4j;
 
-import eu.europa.esig.dss.x509.ocsp.OCSPSource;
+import eu.europa.esig.dss.spi.x509.revocation.ocsp.OCSPSource;
 import org.digidoc4j.impl.CommonOCSPSource;
 import org.digidoc4j.impl.ConfigurationSingeltonHolder;
 import org.digidoc4j.impl.SKOnlineOCSPSource;

diff --git a/digidoc4j/src/main/java/org/digidoc4j/Signature.java b/digidoc4j/src/main/java/org/digidoc4j/Signature.java
@@ -42,6 +42,13 @@ public interface Signature extends Serializable {
    */
   String getId();
 
+  /**
+   * Returns XML digital signature id if present.
+   *
+   * @return XML digital signature id.
+   */
+  String getXmlDigitalSignatureId();
+
   /**
    * Returns the signature OCSP response nonce.
    * <p>

diff --git a/digidoc4j/src/main/java/org/digidoc4j/SignatureBuilder.java b/digidoc4j/src/main/java/org/digidoc4j/SignatureBuilder.java
@@ -10,7 +10,7 @@
 
 package org.digidoc4j;
 
-import eu.europa.esig.dss.Policy;
+import eu.europa.esig.dss.model.Policy;
 import org.apache.commons.lang3.StringUtils;
 import org.digidoc4j.exceptions.ContainerWithoutFilesException;
 import org.digidoc4j.exceptions.NotSupportedException;
@@ -48,7 +48,7 @@
  * &nbsp;&nbsp; {@link SignatureBuilder#withSignatureDigestAlgorithm(DigestAlgorithm) withSignatureDigestAlgorithm(DigestAlgorithm.SHA256)}. // Digest algorithm is SHA-256 <br/>
  * &nbsp;&nbsp; {@link SignatureBuilder#withSignatureProfile(SignatureProfile) withSignatureProfile(SignatureProfile.LT_TM)}. // Signature profile is Time-Mark <br/>
  * &nbsp;&nbsp; {@link SignatureBuilder#withSigningCertificate(X509Certificate) withSigningCertificate(x509Certificate)}. <br/>
- * &nbsp;&nbsp; {@link SignatureBuilder#withSignatureId(String) withSignatureId("1")}. <br/>
+ * &nbsp;&nbsp; {@link SignatureBuilder#withXmlDigitalSignatureId(String) withXmlDigitalSignatureId("1")}. <br/>
  * &nbsp;&nbsp; {@link SignatureBuilder#withSignatureToken(SignatureToken) withSignatureToken(signatureToken)}. // Use signature token <br/>
  * &nbsp;&nbsp; {@link SignatureBuilder#withEncryptionAlgorithm(EncryptionAlgorithm) withEncryptionAlgorithm(EncryptionAlgorithm.RSA)}. // Encryption algorithm is RSA <br/>
  * &nbsp;&nbsp; {@link SignatureBuilder#withOwnSignaturePolicy(Policy) withOwnSignaturePolicy(policy)}. <br/>
@@ -293,11 +293,11 @@ public SignatureBuilder withSigningCertificate(X509Certificate certificate) {
   /**
    * Set signature ID.
    *
-   * @param signatureId signature id.
+   * @param xmlDigitalSignatureId XML digital signature id.
    * @return builder for creating a signature.
    */
-  public SignatureBuilder withSignatureId(String signatureId) {
+  public SignatureBuilder withXmlDigitalSignatureId(String xmlDigitalSignatureId) {
-    signatureParameters.setSignatureId(signatureId);
+    signatureParameters.setXmlDigitalSignatureId(xmlDigitalSignatureId);
     return this;
   }
 

diff --git a/digidoc4j/src/main/java/org/digidoc4j/SignatureParameters.java b/digidoc4j/src/main/java/org/digidoc4j/SignatureParameters.java
@@ -10,7 +10,7 @@
 
 package org.digidoc4j;
 
-import eu.europa.esig.dss.Policy;
+import eu.europa.esig.dss.model.Policy;
 import org.apache.commons.io.IOUtils;
 import org.digidoc4j.exceptions.DigiDoc4JException;
 import org.slf4j.Logger;
@@ -31,7 +31,7 @@
  * <ul>
  *   <li>Signature production place</li>
  *   <li>Roles of the signer</li>
- *   <li>Signature id</li>
+ *   <li>XML digital signature id</li>
  *   <li>Digest algorithm</li>
  *   <li>Encryption algorithm</li>
  *   <li>Signature profile</li>
@@ -44,7 +44,7 @@ public class SignatureParameters implements Serializable {
   private static final Logger logger = LoggerFactory.getLogger(SignatureParameters.class);
   private SignatureProductionPlace productionPlace = new SignatureProductionPlace();
   private List<String> roles = new ArrayList<>();
-  private String signatureId;
+  private String xmlDigitalSignatureId;
   private DigestAlgorithm digestAlgorithm;
   private EncryptionAlgorithm encryptionAlgorithm;
   private SignatureProfile signatureProfile;
@@ -123,22 +123,22 @@ public void setRoles(List<String> roles) {
   }
 
   /**
-   * Set signature id.
+   * Set XML digital signature id.
    *
-   * @param signatureId signature ID
+   * @param xmlDigitalSignatureId signature ID
    */
-  public void setSignatureId(String signatureId) {
+  public void setXmlDigitalSignatureId(String xmlDigitalSignatureId) {
-    logger.debug("Set signature id to " + signatureId);
+    logger.debug("Set XML digital signature id to " + xmlDigitalSignatureId);
-    this.signatureId = signatureId;
+    this.xmlDigitalSignatureId = xmlDigitalSignatureId;
   }
 
   /**
-   * Get signature id.
+   * Get XML digital signature id.
    *
-   * @return signatureId signature ID
+   * @return xmlDigitalSignatureId signature ID
    */
-  public String getSignatureId() {
+  public String getXmlDigitalSignatureId() {
-    return signatureId;
+    return xmlDigitalSignatureId;
   }
 
   /**

diff --git a/digidoc4j/src/main/java/org/digidoc4j/SignatureValidationResult.java b/digidoc4j/src/main/java/org/digidoc4j/SignatureValidationResult.java
@@ -15,10 +15,10 @@
 
 import org.digidoc4j.impl.asic.report.SignatureValidationReport;
 
-import eu.europa.esig.dss.validation.SignatureQualification;
+import eu.europa.esig.dss.enumerations.SignatureQualification;
-import eu.europa.esig.dss.validation.policy.rules.Indication;
+import eu.europa.esig.dss.enumerations.Indication;
-import eu.europa.esig.dss.validation.policy.rules.SubIndication;
+import eu.europa.esig.dss.enumerations.SubIndication;
-import eu.europa.esig.dss.validation.reports.SimpleReport;
+import eu.europa.esig.dss.simplereport.SimpleReport;
 
 /**
  * Validation result information.

diff --git a/digidoc4j/src/main/java/org/digidoc4j/SignedInfo.java b/digidoc4j/src/main/java/org/digidoc4j/SignedInfo.java
@@ -10,13 +10,13 @@
 
 package org.digidoc4j;
 
-import eu.europa.esig.dss.DSSUtils;
+import eu.europa.esig.dss.spi.DSSUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.Serializable;
 
-import static eu.europa.esig.dss.DigestAlgorithm.forXML;
+import static eu.europa.esig.dss.enumerations.DigestAlgorithm.forXML;
 
 public class SignedInfo implements Serializable {