Performance

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/trunk@167 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c

5 files changed, 49 insertions, 28 deletions

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/BKUHelper.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/BKUHelper.java
index c05c688..5e3033e 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/BKUHelper.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/BKUHelper.java
@@ -2,6 +2,7 @@ package at.knowcenter.wag.egov.egiz.sig.connectors.bku;
 

 import java.io.ByteArrayInputStream;

 import java.io.IOException;

+import java.io.InputStream;

 import java.io.UnsupportedEncodingException;

 import java.security.cert.CertificateException;

 import java.security.cert.CertificateFactory;

@@ -9,6 +10,9 @@ import java.security.cert.X509Certificate;
 import java.util.regex.Matcher;

 import java.util.regex.Pattern;

 

+import at.gv.egiz.pdfas.exceptions.external.ExternalErrorException;

+import at.gv.egiz.pdfas.impl.input.helper.DataSourceHelper;

+

 import org.apache.commons.logging.Log;

 import org.apache.commons.logging.LogFactory;

 

@@ -47,7 +51,10 @@ public final class BKUHelper
    */

   public static String prepareBase64Content(SignatureData data)

   {

-    String base64 = CodingHelper.encodeBase64(data.getData());

+    // PERF: base64 encoding needs byte array 

+    byte [] d = DataSourceHelper.convertDataSourceToByteArray(data.getDataSource());

+    

+    String base64 = CodingHelper.encodeBase64(d);

     if (data.getMimeType().equals("application/pdf")) //$NON-NLS-1$

     {

       log.debug("The data is application/pdf - so the binary data is Base64 encoded."); //$NON-NLS-1$

@@ -69,7 +76,9 @@ public final class BKUHelper
    */

   public static byte[] prepareEnvelopingData(SignatureData data)

   {

-    byte[] enc = data.getData();

+    // PERF: prepareEnvelopingData needs byte array

+    byte[] enc = DataSourceHelper.convertDataSourceToByteArray(data.getDataSource());

+    

     if (data.getMimeType().equals("application/pdf")) //$NON-NLS-1$

     {

       log.debug("The data is application/pdf - so the binary data is Base64 encoded."); //$NON-NLS-1$

@@ -111,15 +120,13 @@ public final class BKUHelper
       Pattern erm_p_e = Pattern.compile("</[\\w]*:?Info>"); //$NON-NLS-1$

       Matcher erm_m_s = erm_p_s.matcher(response_string);

       Matcher erm_m_e = erm_p_e.matcher(response_string);

-      ConnectorException se = new ConnectorException(0, "BKUSigExc"); //$NON-NLS-1$

       String error_code = response_string.substring(erc_m_s.end(), erc_m_e.start());

-      se.setExternalErrorCode(error_code);

+      String error_mess = null;

       if (erm_m_s.find() && erm_m_e.find())

       {

-        String error_mess = response_string.substring(erm_m_s.end(), erm_m_e.start());

-        se.setExternalErrorMessage(error_mess);

+        error_mess = response_string.substring(erm_m_s.end(), erm_m_e.start());

       }

-      throw se;

+      throw new ExternalErrorException(error_code, error_mess);

     }

   }

 

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/BKUPostConnection.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/BKUPostConnection.java
index 321287d..02013a5 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/BKUPostConnection.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/BKUPostConnection.java
@@ -4,16 +4,17 @@
 package at.knowcenter.wag.egov.egiz.sig.connectors.bku;

 

 import java.io.IOException;

+import java.io.InputStream;

 import java.util.Properties;

 

 import org.apache.commons.httpclient.Header;

 import org.apache.commons.httpclient.HttpClient;

 import org.apache.commons.httpclient.HttpException;

 import org.apache.commons.httpclient.methods.PostMethod;

-import org.apache.commons.httpclient.methods.multipart.ByteArrayPartSource;

 import org.apache.commons.httpclient.methods.multipart.FilePart;

 import org.apache.commons.httpclient.methods.multipart.MultipartRequestEntity;

 import org.apache.commons.httpclient.methods.multipart.Part;

+import org.apache.commons.httpclient.methods.multipart.PartSource;

 import org.apache.commons.httpclient.methods.multipart.StringPart;

 import org.apache.commons.httpclient.params.HttpMethodParams;

 import org.apache.commons.logging.Log;

@@ -55,7 +56,7 @@ public final class BKUPostConnection
    * @throws IOException

    */

   public static Properties doPostRequestMultipart(String url, String request,

-      SignatureData data) throws HttpException, IOException

+      final SignatureData data) throws HttpException, IOException

   {

     log.debug("doPostRequestMultipart:"); //$NON-NLS-1$

 

@@ -68,9 +69,25 @@ public final class BKUPostConnection
     // xmlpart.setContentType("text/xml");

     // xmlpart.setTransferEncoding(null);

 

-    String filename = data.getMimeType().equals("application/pdf") ? "myfile.pdf" : "myfile.txt"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-    ByteArrayPartSource baps = new ByteArrayPartSource(filename, data.getData());

-    FilePart filepart = new FilePart("fileupload", baps); //$NON-NLS-1$

+    final String filename = data.getMimeType().equals("application/pdf") ? "myfile.pdf" : "myfile.txt"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+    PartSource ps = new PartSource() {

+      public InputStream createInputStream() throws IOException

+      {

+         return data.getDataSource().createInputStream();

+      }

+

+      public String getFileName()

+      {

+        return filename;

+      }

+

+      public long getLength()

+      {

+        return data.getDataSource().getLength();

+      }

+    };

+    //ByteArrayPartSource baps = new ByteArrayPartSource(filename, data.getData());

+    FilePart filepart = new FilePart("fileupload", ps); //$NON-NLS-1$

     filepart.setContentType(data.getMimeType());

     // this is optional

     // filepart.setCharSet(data.getCharacterEncoding());

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/DetachedBKUConnector.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/DetachedBKUConnector.java
index 410c46e..c84ce8a 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/DetachedBKUConnector.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/DetachedBKUConnector.java
@@ -10,6 +10,7 @@ import java.util.Properties;
 import org.apache.commons.logging.Log;

 import org.apache.commons.logging.LogFactory;

 

+import at.gv.egiz.pdfas.exceptions.ErrorCode;

 import at.knowcenter.wag.egov.egiz.cfg.SettingsReader;

 import at.knowcenter.wag.egov.egiz.exceptions.ConnectorException;

 import at.knowcenter.wag.egov.egiz.exceptions.SettingsException;

@@ -231,7 +232,6 @@ public class DetachedBKUConnector implements Connector, LocalConnector
 

     SignSignatureObject sso = analyzeSignResponse(response_properties);

 

-    // TODO this could be made more generic

     sso.response_properties = response_properties;

 

     log.debug("doSign finished."); //$NON-NLS-1$

@@ -256,7 +256,7 @@ public class DetachedBKUConnector implements Connector, LocalConnector
     String verify_request_xml = prepareVerifyRequest(data, so);

     log.debug("verify_request_xml = " + verify_request_xml); //$NON-NLS-1$

 

-    // TODO debug

+    // TODO debug - remove

     // try

     // {

     // FileOutputStream fos = new

@@ -351,8 +351,9 @@ public class DetachedBKUConnector implements Connector, LocalConnector
 

       // data digest replace

       {

-        byte[] data_value = data.getData();

-        byte[] data_value_hash = CodingHelper.buildDigest(data_value);

+//        byte[] data_value = data.getData();

+//        byte[] data_value_hash = CodingHelper.buildDigest(data_value);

+        byte[] data_value_hash = CodingHelper.buildDigest(data.getDataSource());

         String object_data_hash = CodingHelper.encodeBase64(data_value_hash);

 

         verify_xml = verify_xml.replaceFirst(TemplateReplaces.DIGEST_VALUE_SIGNED_DATA_REPLACE, object_data_hash);

@@ -583,8 +584,7 @@ public class DetachedBKUConnector implements Connector, LocalConnector
       

       if (this.verify_request_template == null)

       {

-        // TODO make this a settings exception

-        throw new ConnectorException(300, "Can not read the verify xml request template"); //$NON-NLS-1$

+        throw new ConnectorException(ErrorCode.SETTING_NOT_FOUND, "Can not read the verify xml request template"); //$NON-NLS-1$

       }

 

       // load template key file

@@ -599,8 +599,7 @@ public class DetachedBKUConnector implements Connector, LocalConnector
 

       if (this.verify_template == null)

       {

-        // TODO make this a settings exception

-        throw new ConnectorException(300, "Can not read the verify template"); //$NON-NLS-1$

+        throw new ConnectorException(ErrorCode.SETTING_NOT_FOUND, "Can not read the verify template"); //$NON-NLS-1$

       }

 

       this.verify_url = getConnectorValueFromProfile(settings, profile, VERIFY_URL_KEY);

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/EnvelopedBase64BKUConnector.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/EnvelopedBase64BKUConnector.java
index 4983da7..82ec9bd 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/EnvelopedBase64BKUConnector.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/EnvelopedBase64BKUConnector.java
@@ -10,6 +10,7 @@ import java.util.Properties;
 import org.apache.commons.logging.Log;

 import org.apache.commons.logging.LogFactory;

 

+import at.gv.egiz.pdfas.exceptions.ErrorCode;

 import at.knowcenter.wag.egov.egiz.cfg.SettingsReader;

 import at.knowcenter.wag.egov.egiz.exceptions.ConnectorException;

 import at.knowcenter.wag.egov.egiz.exceptions.SettingsException;

@@ -83,7 +84,6 @@ public class EnvelopedBase64BKUConnector implements Connector, LocalConnector
 //    DebugHelper.debugStringToFile(response_properties.getProperty(BKUPostConnection.RESPONSE_STRING_KEY), "BKU_EnvB64_sign_response.xml"); //$NON-NLS-1$

     SignSignatureObject sso = analyzeSignResponse(response_properties);

 

-    // TODO this could be made more generic

     sso.response_properties = response_properties;

 

     log.debug("doSign finished."); //$NON-NLS-1$

@@ -487,16 +487,14 @@ public class EnvelopedBase64BKUConnector implements Connector, LocalConnector
       this.verify_request_template = FileHelper.readFromFile(SettingsReader.relocateFile(verify_request_filename));

       if (this.verify_request_template == null)

       {

-        // TODO make this a settings exception

-        throw new ConnectorException(300, "Can not read the verify xml request template"); //$NON-NLS-1$

+        throw new ConnectorException(ErrorCode.SETTING_NOT_FOUND, "Can not read the verify xml request template"); //$NON-NLS-1$

       }

 

       String verify_filename = getConnectorValueFromProfile(settings, profile, VERIFY_TEMPLATE_KEY);

       this.verify_template = FileHelper.readFromFile(SettingsReader.relocateFile(verify_filename));

       if (this.verify_template == null)

       {

-        // TODO make this a settings exception

-        throw new ConnectorException(300, "Can not read the verify template"); //$NON-NLS-1$

+        throw new ConnectorException(ErrorCode.SETTING_NOT_FOUND, "Can not read the verify template"); //$NON-NLS-1$

       }

 

       this.verify_url = getConnectorValueFromProfile(settings, profile, VERIFY_URL_KEY);

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/OldEnvelopingBase64BKUConnector.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/OldEnvelopingBase64BKUConnector.java
index d1fffb1..586879a 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/OldEnvelopingBase64BKUConnector.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/OldEnvelopingBase64BKUConnector.java
@@ -8,6 +8,7 @@ import java.io.UnsupportedEncodingException;
 import org.apache.commons.logging.Log;

 import org.apache.commons.logging.LogFactory;

 

+import at.gv.egiz.pdfas.exceptions.ErrorCode;

 import at.knowcenter.wag.egov.egiz.cfg.SettingsReader;

 import at.knowcenter.wag.egov.egiz.exceptions.ConnectorException;

 import at.knowcenter.wag.egov.egiz.exceptions.SettingsException;

@@ -95,15 +96,14 @@ public class OldEnvelopingBase64BKUConnector extends EnvelopedBase64BKUConnector
       }

       catch (SettingsException e)

       {

-        throw new ConnectorException(300, e);

+        throw new ConnectorException(ErrorCode.SETTING_NOT_FOUND, e);

       }

 

       String verify_filename = getConnectorValueFromProfile(settings, profile, VERIFY_TEMPLATE_KEY);

       this.verify_template = FileHelper.readFromFile(SettingsReader.relocateFile(verify_filename));

       if (this.verify_template == null)

       {

-        // TODO make this a settings exception

-        throw new ConnectorException(300, "Can not read the verify template"); //$NON-NLS-1$

+        throw new ConnectorException(ErrorCode.SETTING_NOT_FOUND, "Can not read the verify template"); //$NON-NLS-1$

       }

 

     }