some code code-style modifications

active code-quality checks!

1 files changed, 55 insertions, 49 deletions

diff --git a/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eid/authhandler/modules/sigverify/moasig/impl/SignatureVerificationService.java b/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eid/authhandler/modules/sigverify/moasig/impl/SignatureVerificationService.java
index 3dbda391..8fc4086e 100644
--- a/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eid/authhandler/modules/sigverify/moasig/impl/SignatureVerificationService.java
+++ b/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eid/authhandler/modules/sigverify/moasig/impl/SignatureVerificationService.java
@@ -3,10 +3,21 @@ package at.gv.egiz.eid.authhandler.modules.sigverify.moasig.impl;
 import java.io.ByteArrayInputStream;
 import java.security.cert.CertificateEncodingException;
 import java.util.List;
+
 import javax.annotation.PostConstruct;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.lang.Nullable;
+import org.springframework.stereotype.Service;
+import org.springframework.util.Base64Utils;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
 import at.gv.egiz.eid.authhandler.modules.sigverify.moasig.api.ISignatureVerificationService;
-import at.gv.egiz.eid.authhandler.modules.sigverify.moasig.api.data.ICMSSignatureVerificationResponse;
-import at.gv.egiz.eid.authhandler.modules.sigverify.moasig.api.data.IXMLSignatureVerificationResponse;
+import at.gv.egiz.eid.authhandler.modules.sigverify.moasig.api.data.ICmsSignatureVerificationResponse;
+import at.gv.egiz.eid.authhandler.modules.sigverify.moasig.api.data.IXmlSignatureVerificationResponse;
 import at.gv.egiz.eid.authhandler.modules.sigverify.moasig.exceptions.MoaSigServiceBuilderException;
 import at.gv.egiz.eid.authhandler.modules.sigverify.moasig.exceptions.MoaSigServiceException;
 import at.gv.egiz.eid.authhandler.modules.sigverify.moasig.impl.parser.VerifyXmlSignatureResponseParser;
@@ -22,15 +33,6 @@ import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureResponse;
 import at.gv.egovernment.moa.spss.server.invoke.CMSSignatureVerificationInvoker;
 import at.gv.egovernment.moa.spss.server.invoke.XMLSignatureVerificationInvoker;
 import at.gv.egovernment.moaspss.util.Constants;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.lang.Nullable;
-import org.springframework.stereotype.Service;
-import org.springframework.util.Base64Utils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
 
 /**
  * MOA-Sig based signature verification implementation.
@@ -54,12 +56,12 @@ public class SignatureVerificationService extends AbstractSignatureService
   /*
    * (non-Javadoc)
    *
-   * @see at.gv.egiz.eid.authhandler.modules.sigverify.moasig.impl.ISignatureVerificationService#
-   * verifyCMSSignature(byte[], java.lang.String)
+   * @see at.gv.egiz.eid.authhandler.modules.sigverify.moasig.impl.
+   * ISignatureVerificationService# verifyCMSSignature(byte[], java.lang.String)
    */
   @Override
   @Nullable
-  public ICMSSignatureVerificationResponse verifyCmsSignature(final byte[] signature,
+  public ICmsSignatureVerificationResponse verifyCmsSignature(final byte[] signature,
       final String trustProfileID) throws MoaSigServiceException {
     try {
       // setup context
@@ -74,12 +76,12 @@ public class SignatureVerificationService extends AbstractSignatureService
 
     } catch (final MOAException e) {
       log.warn("CMS signature verification has an error.", e);
-      throw new MoaSigServiceException("service.03", new Object[] {e.toString()}, e);
+      throw new MoaSigServiceException("service.03", new Object[] { e.toString() }, e);
 
     } catch (final CertificateEncodingException e) {
       log.warn("Can NOT serialize X509 certificate from CMS/CAdES signature-verification response",
           e);
-      throw new MoaSigServiceException("service.03", new Object[] {e.toString()}, e);
+      throw new MoaSigServiceException("service.03", new Object[] { e.toString() }, e);
 
     } finally {
       tearDownContexts();
@@ -91,11 +93,11 @@ public class SignatureVerificationService extends AbstractSignatureService
   /*
    * (non-Javadoc)
    *
-   * @see at.gv.egiz.eid.authhandler.modules.sigverify.moasig.impl.ISignatureVerificationService#
-   * verifyXMLSignature(byte[], java.lang.String)
+   * @see at.gv.egiz.eid.authhandler.modules.sigverify.moasig.impl.
+   * ISignatureVerificationService# verifyXMLSignature(byte[], java.lang.String)
    */
   @Override
-  public IXMLSignatureVerificationResponse verifyXmlSignature(final byte[] signature,
+  public IXmlSignatureVerificationResponse verifyXmlSignature(final byte[] signature,
       final String trustProfileID) throws MoaSigServiceException {
     return verifyXmlSignature(signature, trustProfileID, null, DEFAULT_XPATH_SIGNATURE_LOCATION);
 
@@ -104,11 +106,12 @@ public class SignatureVerificationService extends AbstractSignatureService
   /*
    * (non-Javadoc)
    *
-   * @see at.gv.egiz.eid.authhandler.modules.sigverify.moasig.impl.ISignatureVerificationService#
-   * verifyXMLSignature(byte[], java.lang.String, java.util.List)
+   * @see at.gv.egiz.eid.authhandler.modules.sigverify.moasig.impl.
+   * ISignatureVerificationService# verifyXMLSignature(byte[], java.lang.String,
+   * java.util.List)
    */
   @Override
-  public IXMLSignatureVerificationResponse verifyXmlSignature(final byte[] signature,
+  public IXmlSignatureVerificationResponse verifyXmlSignature(final byte[] signature,
       final String trustProfileID, final List<String> verifyTransformsInfoProfileID)
       throws MoaSigServiceException {
     return verifyXmlSignature(signature, trustProfileID, verifyTransformsInfoProfileID,
@@ -118,11 +121,12 @@ public class SignatureVerificationService extends AbstractSignatureService
   /*
    * (non-Javadoc)
    *
-   * @see at.gv.egiz.eid.authhandler.modules.sigverify.moasig.impl.ISignatureVerificationService#
-   * verifyXMLSignature(byte[], java.lang.String, java.lang.String)
+   * @see at.gv.egiz.eid.authhandler.modules.sigverify.moasig.impl.
+   * ISignatureVerificationService# verifyXMLSignature(byte[], java.lang.String,
+   * java.lang.String)
    */
   @Override
-  public IXMLSignatureVerificationResponse verifyXmlSignature(final byte[] signature,
+  public IXmlSignatureVerificationResponse verifyXmlSignature(final byte[] signature,
       final String trustProfileID, final String signatureLocationXpath)
       throws MoaSigServiceException {
     return verifyXmlSignature(signature, trustProfileID, null, signatureLocationXpath);
@@ -131,11 +135,12 @@ public class SignatureVerificationService extends AbstractSignatureService
   /*
    * (non-Javadoc)
    *
-   * @see at.gv.egiz.eid.authhandler.modules.sigverify.moasig.impl.ISignatureVerificationService#
-   * verifyXMLSignature(byte[], java.lang.String, java.util.List, java.lang.String)
+   * @see at.gv.egiz.eid.authhandler.modules.sigverify.moasig.impl.
+   * ISignatureVerificationService# verifyXMLSignature(byte[], java.lang.String,
+   * java.util.List, java.lang.String)
    */
   @Override
-  public IXMLSignatureVerificationResponse verifyXmlSignature(final byte[] signature,
+  public IXmlSignatureVerificationResponse verifyXmlSignature(final byte[] signature,
       final String trustProfileID, final List<String> verifyTransformsInfoProfileID,
       final String xpathSignatureLocation) throws MoaSigServiceException {
     try {
@@ -153,7 +158,7 @@ public class SignatureVerificationService extends AbstractSignatureService
       final Document result = new VerifyXMLSignatureResponseBuilder(true).build(vsresponse);
 
       // parses the <IXMLSignatureVerificationResponse>
-      final IXMLSignatureVerificationResponse verifyXmlSignatureResponse =
+      final IXmlSignatureVerificationResponse verifyXmlSignatureResponse =
           new VerifyXmlSignatureResponseParser(result.getDocumentElement()).parseData();
 
       return verifyXmlSignatureResponse;
@@ -164,7 +169,7 @@ public class SignatureVerificationService extends AbstractSignatureService
     } catch (final MOAException e) {
       log.warn("MOA-Sig signature-verification has an internal error." + " MsgCode: "
           + e.getMessageId() + " Msg: " + e.getMessage(), e);
-      throw new MoaSigServiceException("service.moasig.03", new Object[] {e.getMessage()}, e);
+      throw new MoaSigServiceException("service.moasig.03", new Object[] { e.getMessage() }, e);
 
     } finally {
       tearDownContexts();
@@ -172,7 +177,7 @@ public class SignatureVerificationService extends AbstractSignatureService
     }
   }
 
-  private ICMSSignatureVerificationResponse parseCmsVerificationResult(
+  private ICmsSignatureVerificationResponse parseCmsVerificationResult(
       final VerifyCMSSignatureResponse cmsSigVerifyResp) throws CertificateEncodingException {
 
     if (cmsSigVerifyResp.getResponseElements() == null
@@ -190,8 +195,8 @@ public class SignatureVerificationService extends AbstractSignatureService
     final VerifyCMSSignatureResponseElement firstSig =
         (VerifyCMSSignatureResponseElement) cmsSigVerifyResp.getResponseElements().get(0);
 
-    final at.gv.egiz.eid.authhandler.modules.sigverify.moasig.impl.data.VerifyCMSSignatureResponse result =
-        new at.gv.egiz.eid.authhandler.modules.sigverify.moasig.impl.data.VerifyCMSSignatureResponse();
+    final at.gv.egiz.eid.authhandler.modules.sigverify.moasig.impl.data.VerifyCmsSignatureResponse result =
+        new at.gv.egiz.eid.authhandler.modules.sigverify.moasig.impl.data.VerifyCmsSignatureResponse();
 
     // parse results into response container
     result.setSignatureCheckCode(firstSig.getSignatureCheck().getCode());
@@ -216,14 +221,16 @@ public class SignatureVerificationService extends AbstractSignatureService
   /**
    * Build a VerifyCMS-Siganture request for MOA-Sig. <br>
    * <br>
-   * This builder only generates verification-request for enveloped CMS or CAdES signatures <br>
+   * This builder only generates verification-request for enveloped CMS or CAdES
+   * signatures <br>
    * This
    *
-   * @param signature CMS or CAdES signature
-   * @param trustProfileID trustProfileID MOA-Sig Trust-Profile
-   * @param isPdfSignature Make CAdES signature as part of an PAdES document
-   * @param performExtendedValidation To extended validation. See MOA-Sig documentation for detailed
-   *        information
+   * @param signature                 CMS or CAdES signature
+   * @param trustProfileID            trustProfileID MOA-Sig Trust-Profile
+   * @param isPdfSignature            Make CAdES signature as part of an PAdES
+   *                                  document
+   * @param performExtendedValidation To extended validation. See MOA-Sig
+   *                                  documentation for detailed information
    * @return
    */
   private VerifyCMSSignatureRequest buildVerfifyCmsRequest(final byte[] signature,
@@ -245,11 +252,12 @@ public class SignatureVerificationService extends AbstractSignatureService
   /**
    * Build a VerifyXML-Signature request for MOA-Sig.
    *
-   * @param signature Serialized XML signature
-   * @param trustProfileID MOA-Sig Trust-Profile
-   * @param verifyTransformsInfoProfileID {@link List} of Transformation-Profiles used for
-   *        validation
-   * @param xpathSignatureLocation Xpath that points to location of Signature element
+   * @param signature                     Serialized XML signature
+   * @param trustProfileID                MOA-Sig Trust-Profile
+   * @param verifyTransformsInfoProfileID {@link List} of Transformation-Profiles
+   *                                      used for validation
+   * @param xpathSignatureLocation        Xpath that points to location of
+   *                                      Signature element
    * @return MOA-Sig verification request element
    * @throws MoaSigServiceBuilderException In case of an error
    */
@@ -266,7 +274,6 @@ public class SignatureVerificationService extends AbstractSignatureService
           Constants.DSIG_NS_URI);
       requestDoc_.appendChild(requestElem_);
 
-
       // build the request
       final Element verifiySignatureInfoElem =
           requestDoc_.createElementNS(MOA_NS_URI, "VerifySignatureInfo");
@@ -331,19 +338,18 @@ public class SignatureVerificationService extends AbstractSignatureService
 
     } catch (final Throwable t) {
       log.warn("Can NOT build VerifyXML-Signature request for MOA-Sig", t);
-      throw new MoaSigServiceBuilderException("service.moasig.03", new Object[] {t.getMessage()},
+      throw new MoaSigServiceBuilderException("service.moasig.03", new Object[] { t.getMessage() },
           t);
 
     }
 
   }
 
-
-
   @PostConstruct
   protected void internalInitializer() {
     log.debug("Instanzing SignatureVerificationService implementation ... ");
-    // svs = at.gv.egovernment.moa.spss.api.SignatureVerificationService.getInstance();
+    // svs =
+    // at.gv.egovernment.moa.spss.api.SignatureVerificationService.getInstance();
     cadesInvoker = CMSSignatureVerificationInvoker.getInstance();
     xadesInvocer = XMLSignatureVerificationInvoker.getInstance();
     log.info("MOA-Sig signature-verification service initialized");