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, 26 insertions, 24 deletions

diff --git a/moaSig/moa-asic/src/main/java/at/gv/egiz/asic/impl/verifier/CAdESVerifier.java b/moaSig/moa-asic/src/main/java/at/gv/egiz/asic/impl/verifier/CAdESVerifier.java
index 5ab677c..ac96f90 100644
--- a/moaSig/moa-asic/src/main/java/at/gv/egiz/asic/impl/verifier/CAdESVerifier.java
+++ b/moaSig/moa-asic/src/main/java/at/gv/egiz/asic/impl/verifier/CAdESVerifier.java
@@ -1,5 +1,8 @@
 package at.gv.egiz.asic.impl.verifier;
 
+import java.io.InputStream;
+import java.util.Date;
+
 import at.gv.egiz.asic.api.ASiC;
 import at.gv.egovernment.moa.spss.MOAException;
 import at.gv.egovernment.moa.spss.api.SPSSFactory;
@@ -9,35 +12,34 @@ import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureRequest;
 import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponse;
 import at.gv.egovernment.moa.spss.server.invoke.CMSSignatureVerificationInvoker;
 
-import java.io.InputStream;
-import java.util.Date;
-
 /**
  * Created by Andreas Fitzek on 6/17/16.
  */
 public abstract class CAdESVerifier extends BaseVerifier {
-    @Override
-    public boolean handles(ASiC asic) {
-        return asic.isCAdES();
-    }
+  @Override
+  public boolean handles(ASiC asic) {
+    return asic.isCAdES();
+  }
 
-    protected VerifyCMSSignatureResponse runCMSVerification(InputStream signedData, InputStream cmsSignature,
-                                                            String trustProfileID, Date date) throws MOAException {
-        CMSContent cmsContent = SPSSFactory.getInstance().createCMSContent(signedData);
-        CMSDataObject cmsDataObject = SPSSFactory.getInstance().createCMSDataObject(null, cmsContent, null, null);
+  protected VerifyCMSSignatureResponse runCMSVerification(InputStream signedData, InputStream cmsSignature,
+      String trustProfileID, Date date) throws MOAException {
+    final CMSContent cmsContent = SPSSFactory.getInstance().createCMSContent(signedData);
+    final CMSDataObject cmsDataObject = SPSSFactory.getInstance().createCMSDataObject(null, cmsContent, null,
+        null);
 
-        VerifyCMSSignatureRequest verifyCMSSignatureRequest =
-                SPSSFactory.getInstance().createVerifyCMSSignatureRequest(
-                        VerifyCMSSignatureRequest.ALL_SIGNATORIES,
-                        date,
-                        cmsSignature,
-                        cmsDataObject,
-                        trustProfileID,
-                        false,
-                        true);
+    final VerifyCMSSignatureRequest verifyCMSSignatureRequest =
+        SPSSFactory.getInstance().createVerifyCMSSignatureRequest(
+            VerifyCMSSignatureRequest.ALL_SIGNATORIES,
+            date,
+            cmsSignature,
+            cmsDataObject,
+            trustProfileID,
+            false,
+            true);
 
-        VerifyCMSSignatureResponse verifyResponse = CMSSignatureVerificationInvoker.getInstance().verifyCMSSignature(
-                verifyCMSSignatureRequest);
-        return verifyResponse;
-    }
+    final VerifyCMSSignatureResponse verifyResponse = CMSSignatureVerificationInvoker.getInstance()
+        .verifyCMSSignature(
+            verifyCMSSignatureRequest);
+    return verifyResponse;
+  }
 }