1 files changed, 30 insertions, 27 deletions
diff --git a/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eid/authhandler/modules/sigverify/moasig/impl/parser/VerifyXmlSignatureResponseParser.java b/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eid/authhandler/modules/sigverify/moasig/impl/parser/VerifyXmlSignatureResponseParser.java
index aa094f1e..231cb94f 100644
--- a/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eid/authhandler/modules/sigverify/moasig/impl/parser/VerifyXmlSignatureResponseParser.java
+++ b/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eid/authhandler/modules/sigverify/moasig/impl/parser/VerifyXmlSignatureResponseParser.java
@@ -2,23 +2,24 @@ package at.gv.egiz.eid.authhandler.modules.sigverify.moasig.impl.parser;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
-import at.gv.egiz.eid.authhandler.modules.sigverify.moasig.api.data.IXMLSignatureVerificationResponse;
-import at.gv.egiz.eid.authhandler.modules.sigverify.moasig.exceptions.MoaSigServiceException;
-import at.gv.egiz.eid.authhandler.modules.sigverify.moasig.exceptions.MoaSigServiceParserException;
-import at.gv.egiz.eid.authhandler.modules.sigverify.moasig.impl.data.VerifyXMLSignatureResponse;
-import at.gv.egovernment.moaspss.util.Constants;
-import at.gv.egovernment.moaspss.util.DOMUtils;
-import at.gv.egovernment.moaspss.util.XPathUtils;
+
 import org.joda.time.DateTime;
 import org.joda.time.format.ISODateTimeFormat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.lang.NonNull;
 import org.w3c.dom.Element;
+
+import at.gv.egiz.eid.authhandler.modules.sigverify.moasig.api.data.IXmlSignatureVerificationResponse;
+import at.gv.egiz.eid.authhandler.modules.sigverify.moasig.exceptions.MoaSigServiceException;
+import at.gv.egiz.eid.authhandler.modules.sigverify.moasig.exceptions.MoaSigServiceParserException;
+import at.gv.egiz.eid.authhandler.modules.sigverify.moasig.impl.data.VerifyXmlSignatureResponse;
+import at.gv.egovernment.moaspss.util.Constants;
+import at.gv.egovernment.moaspss.util.DOMUtils;
+import at.gv.egovernment.moaspss.util.XPathUtils;
 import iaik.utils.Base64InputStream;
 import iaik.x509.X509Certificate;
 
-
 public class VerifyXmlSignatureResponseParser {
   private static final Logger log = LoggerFactory.getLogger(VerifyXmlSignatureResponseParser.class);
 
@@ -63,13 +64,15 @@ public class VerifyXmlSignatureResponseParser {
 
   private static final String SIGNING_TIME_XPATH = ROOT + MOA + "SigningTime";
 
-
-  /** This is the root element of the XML-Document provided by the Security Layer Card. */
+  /**
+   * This is the root element of the XML-Document provided by the Security Layer
+   * Card.
+   */
   private Element verifyXmlSignatureResponse;
 
   /**
-   * Constructor for VerifyXMLSignatureResponseParser. A DOM-representation of the incoming String
-   * will be created
+   * Constructor for VerifyXMLSignatureResponseParser. A DOM-representation of the
+   * incoming String will be created
    *
    * @param xmlResponse <code>&lt;InfoboxReadResponse&gt;</code> as String
    * @throws MoaSigServiceParserException on any parsing error
@@ -82,14 +85,14 @@ public class VerifyXmlSignatureResponseParser {
 
     } catch (final Throwable t) {
       log.warn("Can not parse MOA-Sig response.", t);
-      throw new MoaSigServiceParserException("service.moasig.02", new Object[] {t.toString()}, t);
+      throw new MoaSigServiceParserException("service.moasig.02", new Object[] { t.toString() }, t);
 
     }
   }
 
   /**
-   * Constructor for VerifyXMLSignatureResponseParser. A DOM-representation of the incoming
-   * Inputstream will be created
+   * Constructor for VerifyXMLSignatureResponseParser. A DOM-representation of the
+   * incoming Inputstream will be created
    *
    * @param xmlResponse <code>&lt;InfoboxReadResponse&gt;</code> as InputStream
    * @throws MoaSigServiceParserException on any parsing error
@@ -101,14 +104,14 @@ public class VerifyXmlSignatureResponseParser {
 
     } catch (final Throwable t) {
       log.warn("Can not parse MOA-Sig response.", t);
-      throw new MoaSigServiceParserException("service.moasig.02", new Object[] {t.toString()}, t);
+      throw new MoaSigServiceParserException("service.moasig.02", new Object[] { t.toString() }, t);
 
     }
   }
 
   /**
-   * Constructor for VerifyXMLSignatureResponseParser. The incoming Element will be used for further
-   * operations
+   * Constructor for VerifyXMLSignatureResponseParser. The incoming Element will
+   * be used for further operations
    *
    * @param xmlResponse <code>&lt;InfoboxReadResponse&gt;</code> as Element
    */
@@ -118,15 +121,16 @@ public class VerifyXmlSignatureResponseParser {
   }
 
   /**
-   * Parse MOA-Sig signatur-verification result into {@link IXMLSignatureVerificationResponse}.
+   * Parse MOA-Sig signatur-verification result into
+   * {@link IXmlSignatureVerificationResponse}.
    *
-   * @return {@link IXMLSignatureVerificationResponse}
+   * @return {@link IXmlSignatureVerificationResponse}
    * @throws MoaSigServiceException on any parsing error
    */
   @NonNull
-  public IXMLSignatureVerificationResponse parseData() throws MoaSigServiceException {
+  public IXmlSignatureVerificationResponse parseData() throws MoaSigServiceException {
     try {
-      final VerifyXMLSignatureResponse respData = new VerifyXMLSignatureResponse();
+      final VerifyXmlSignatureResponse respData = new VerifyXmlSignatureResponse();
       respData.setXmlDsigSubjectName(
           XPathUtils.getElementValue(verifyXmlSignatureResponse, DSIG_SUBJECT_NAME_XPATH, ""));
       final Element e = (Element) XPathUtils.selectSingleNode(verifyXmlSignatureResponse,
@@ -151,11 +155,11 @@ public class VerifyXmlSignatureResponseParser {
       final String xmlDsigCheckCode = XPathUtils.getElementValue(verifyXmlSignatureResponse,
           XMLDSIG_MANIFEST_CHECK_CODE_XPATH, null);
       if (xmlDsigCheckCode != null) {
-        respData.setXmlDSIGManigest(true);
-        respData.setXmlDSIGManifestCheckCode(Integer.parseInt(xmlDsigCheckCode));
+        respData.setXmlDsigManigest(true);
+        respData.setXmlDsigManifestCheckCode(Integer.parseInt(xmlDsigCheckCode));
 
       } else {
-        respData.setXmlDSIGManigest(false);
+        respData.setXmlDsigManigest(false);
 
       }
 
@@ -181,10 +185,9 @@ public class VerifyXmlSignatureResponseParser {
 
     } catch (final Throwable t) {
       log.warn("Can not parse MOA-Sig response.", t);
-      throw new MoaSigServiceParserException("service.moasig.02", new Object[] {t.toString()}, t);
+      throw new MoaSigServiceParserException("service.moasig.02", new Object[] { t.toString() }, t);
     }
 
   }
 
-
 }