1 files changed, 36 insertions, 43 deletions

diff --git a/moaSig/moa-asic/src/main/java/at/gv/egiz/asic/xmlbind/VerifyASICSignatureRequestParser.java b/moaSig/moa-asic/src/main/java/at/gv/egiz/asic/xmlbind/VerifyASICSignatureRequestParser.java
index c06e30e..b152b6d 100644
--- a/moaSig/moa-asic/src/main/java/at/gv/egiz/asic/xmlbind/VerifyASICSignatureRequestParser.java
+++ b/moaSig/moa-asic/src/main/java/at/gv/egiz/asic/xmlbind/VerifyASICSignatureRequestParser.java
@@ -21,31 +21,25 @@
  * that you distribute must include a readable copy of the "NOTICE" text file.
  */
 
-
 package at.gv.egiz.asic.xmlbind;
 
+import java.io.InputStream;
+import java.util.Date;
+
+import org.w3c.dom.Element;
+
 import at.gv.egiz.asic.api.ASiCFormat;
 import at.gv.egovernment.moa.spss.MOAApplicationException;
 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.common.MetaInfo;
 import at.gv.egovernment.moa.spss.api.xmlbind.RequestParserUtils;
-import at.gv.egovernment.moaspss.util.*;
-import org.w3c.dom.Element;
-
-import java.io.InputStream;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.StringTokenizer;
+import at.gv.egovernment.moaspss.util.Base64Utils;
+import at.gv.egovernment.moaspss.util.Constants;
+import at.gv.egovernment.moaspss.util.XPathUtils;
 
 /**
  * A parser to parse <code>VerifyCMSSignatureRequest</code> DOM trees into
  * <code>VerifyCMSSignatureRequest</code> API objects.
- * 
+ *
  * @author Patrick Peck
  * @version $Id$
  */
@@ -61,48 +55,47 @@ public class VerifyASICSignatureRequestParser {
   private static final String ASIC_EXTENSION_XPATH = MOA + "ASICExtension";
   private static final String TRUST_PROFILE_ID_XPATH = MOA + "TrustProfileID";
 
-
   /** The <code>SPSSFactory</code> for creating new API objects. */
-  private SPSSFactory factory = SPSSFactory.getInstance();
+  private final SPSSFactory factory = SPSSFactory.getInstance();
 
   /**
-   * Parse a <code>VerifyCMSSignatureRequest</code> DOM element, as defined
-   * by the MOA schema.
-   * 
+   * Parse a <code>VerifyCMSSignatureRequest</code> DOM element, as defined by the
+   * MOA schema.
+   *
    * @param requestElem The <code>VerifyCMSSignatureRequest</code> to parse. The
-   * request must have been successfully parsed against the schema for this
-   * method to succeed.
-   * @return A <code>VerifyCMSSignatureRequest</code> API objects containing
-   * the data from the DOM element.
+   *                    request must have been successfully parsed against the
+   *                    schema for this method to succeed.
+   * @return A <code>VerifyCMSSignatureRequest</code> API objects containing the
+   *         data from the DOM element.
    * @throws MOAApplicationException An error occurred parsing the request.
    */
   public VerifyASiCRequest parseASIC(Element requestElem)
-    throws MOAApplicationException {
-    Date dateTime =
-      RequestParserUtils.parseDateTime(requestElem, DATE_TIME_XPATH);
+      throws MOAApplicationException {
+    final Date dateTime =
+        RequestParserUtils.parseDateTime(requestElem, DATE_TIME_XPATH);
+
+    final boolean extendedValidation =
+        RequestParserUtils.parseExtendedValidation(requestElem, EXTENDED_VALIDATION_XPATH, false);
 
-    boolean extendedValidation = 
-    		RequestParserUtils.parseExtendedValidation(requestElem, EXTENDED_VALIDATION_XPATH, false);
-    
-    String asicSignatureStr =
-      XPathUtils.getElementValue(requestElem, ASIC_SIGNATURE_XPATH, "");
+    final String asicSignatureStr =
+        XPathUtils.getElementValue(requestElem, ASIC_SIGNATURE_XPATH, "");
 
-    String asicExtensionStr =
-            XPathUtils.getElementValue(requestElem, ASIC_EXTENSION_XPATH, "");
+    final String asicExtensionStr =
+        XPathUtils.getElementValue(requestElem, ASIC_EXTENSION_XPATH, "");
 
-    String trustProfileID =
-      XPathUtils.getElementValue(requestElem, TRUST_PROFILE_ID_XPATH, null);
-    //Logger.info("CMSSignature: " + cmsSignatureStr);
-    InputStream asicSignature =
-      Base64Utils.decodeToStream(asicSignatureStr, true);
+    final String trustProfileID =
+        XPathUtils.getElementValue(requestElem, TRUST_PROFILE_ID_XPATH, null);
+    // Logger.info("CMSSignature: " + cmsSignatureStr);
+    final InputStream asicSignature =
+        Base64Utils.decodeToStream(asicSignatureStr, true);
 
     ASiCFormat format = null;
 
-    if("asics".equalsIgnoreCase(asicExtensionStr) || "scs".equalsIgnoreCase(asicExtensionStr)
-   || "application/vnd.etsi.asic-s+zip".equalsIgnoreCase(asicExtensionStr)) {
+    if ("asics".equalsIgnoreCase(asicExtensionStr) || "scs".equalsIgnoreCase(asicExtensionStr)
+        || "application/vnd.etsi.asic-s+zip".equalsIgnoreCase(asicExtensionStr)) {
       format = ASiCFormat.ASiCS;
-    } else if("asice".equalsIgnoreCase(asicExtensionStr) || "sce".equalsIgnoreCase(asicExtensionStr)
-            || "application/vnd.etsi.asic-e+zip".equalsIgnoreCase(asicExtensionStr)) {
+    } else if ("asice".equalsIgnoreCase(asicExtensionStr) || "sce".equalsIgnoreCase(asicExtensionStr)
+        || "application/vnd.etsi.asic-e+zip".equalsIgnoreCase(asicExtensionStr)) {
       format = ASiCFormat.ASiCE;
     }