Merge branch 'master' of gitlab.iaik.tugraz.at:egiz/moa-sig

# Conflicts:
#	moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java
#	moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationProvider.java

1 files changed, 33 insertions, 33 deletions

diff --git a/moaSig/moa-asic/src/main/java/at/gv/egiz/asic/impl/verifier/XAdESVerifier.java b/moaSig/moa-asic/src/main/java/at/gv/egiz/asic/impl/verifier/XAdESVerifier.java
index 904ad4e..2074464 100644
--- a/moaSig/moa-asic/src/main/java/at/gv/egiz/asic/impl/verifier/XAdESVerifier.java
+++ b/moaSig/moa-asic/src/main/java/at/gv/egiz/asic/impl/verifier/XAdESVerifier.java
@@ -1,54 +1,54 @@
 package at.gv.egiz.asic.impl.verifier;
 
+import java.io.InputStream;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 import at.gv.egiz.asic.api.ASiC;
-import at.gv.egiz.asic.api.ASiCEntry;
-import at.gv.egiz.asic.api.ASiCVerificationResult;
 import at.gv.egovernment.moa.spss.MOAException;
 import at.gv.egovernment.moa.spss.api.SPSSFactory;
-import at.gv.egovernment.moa.spss.api.cmsverify.CMSContent;
-import at.gv.egovernment.moa.spss.api.cmsverify.CMSDataObject;
-import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureRequest;
-import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponse;
 import at.gv.egovernment.moa.spss.api.common.Content;
-import at.gv.egovernment.moa.spss.api.common.XMLDataObjectAssociation;
-import at.gv.egovernment.moa.spss.api.impl.SPSSFactoryImpl;
-import at.gv.egovernment.moa.spss.api.xmlverify.*;
-import at.gv.egovernment.moa.spss.server.invoke.CMSSignatureVerificationInvoker;
+import at.gv.egovernment.moa.spss.api.xmlverify.VerifySignatureInfo;
+import at.gv.egovernment.moa.spss.api.xmlverify.VerifySignatureLocation;
+import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureRequest;
+import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureResponse;
 import at.gv.egovernment.moa.spss.server.invoke.XMLSignatureVerificationInvoker;
 
-import java.io.InputStream;
-import java.util.*;
-
 /**
  * Created by Andreas Fitzek on 6/17/16.
  */
 public abstract class XAdESVerifier extends BaseVerifier {
-    @Override
-    public boolean handles(ASiC asic) {
-        return asic.isXAdES();
-    }
+  @Override
+  public boolean handles(ASiC asic) {
+    return asic.isXAdES();
+  }
 
-    protected VerifyXMLSignatureResponse runXMLVerification(InputStream signedData, InputStream xmlSignature,
-                                                            String trustProfileID, Date date, List supplementsList,
-                                                            String location, Map namespaces) throws MOAException {
+  protected VerifyXMLSignatureResponse runXMLVerification(InputStream signedData, InputStream xmlSignature,
+      String trustProfileID, Date date, List supplementsList,
+      String location, Map namespaces) throws MOAException {
 
-        if(namespaces == null) {
-            namespaces = new HashMap();
+    if (namespaces == null) {
+      namespaces = new HashMap();
 
-            namespaces.put("asic", "http://uri.etsi.org/02918/v1.2.1#");
-            namespaces.put("ds", "http://www.w3.org/2000/09/xmldsig#");
-        }
+      namespaces.put("asic", "http://uri.etsi.org/02918/v1.2.1#");
+      namespaces.put("ds", "http://www.w3.org/2000/09/xmldsig#");
+    }
 
-        Content content = SPSSFactory.getInstance().createContent(xmlSignature, null);
+    final Content content = SPSSFactory.getInstance().createContent(xmlSignature, null);
 
-        VerifySignatureLocation verifySignatureLocation = SPSSFactory.getInstance().createVerifySignatureLocation(
-                location, namespaces);
+    final VerifySignatureLocation verifySignatureLocation = SPSSFactory.getInstance()
+        .createVerifySignatureLocation(
+            location, namespaces);
 
-        VerifySignatureInfo verifySignatureInfo = SPSSFactory.getInstance().createVerifySignatureInfo(content, verifySignatureLocation);
+    final VerifySignatureInfo verifySignatureInfo = SPSSFactory.getInstance().createVerifySignatureInfo(
+        content, verifySignatureLocation);
 
-        VerifyXMLSignatureRequest verifyXMLSignatureRequest = SPSSFactory.getInstance().createVerifyXMLSignatureRequest(
-                date, verifySignatureInfo, supplementsList, null, false, trustProfileID, true);
+    final VerifyXMLSignatureRequest verifyXMLSignatureRequest = SPSSFactory.getInstance()
+        .createVerifyXMLSignatureRequest(
+            date, verifySignatureInfo, supplementsList, null, false, trustProfileID, true);
 
-        return XMLSignatureVerificationInvoker.getInstance().verifyXMLSignature(verifyXMLSignatureRequest);
-    }
+    return XMLSignatureVerificationInvoker.getInstance().verifyXMLSignature(verifyXMLSignatureRequest);
+  }
 }