Performance

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

1 files changed, 18 insertions, 17 deletions

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/BKUConnector.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/BKUConnector.java
index d6301a9..75e4c31 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/BKUConnector.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/BKUConnector.java
@@ -22,6 +22,8 @@ import java.util.Properties;
 import java.util.regex.Matcher;

 import java.util.regex.Pattern;

 

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

+

 import org.apache.log4j.Level;

 import org.apache.log4j.Logger;

 

@@ -41,6 +43,8 @@ import at.knowcenter.wag.egov.egiz.tools.FileHelper;
 /**

  * Connector for communicating with BKU.

  * 

+ * @deprecated use the new connectors.

+ * 

  * @author wlackner

  * @author wprinz

  */

@@ -270,7 +274,7 @@ public class BKUConnector implements LocalConnector
     ids[3] = extractId(xmlResponse, "etsi-data-reference-");

     ids[4] = extractId(xmlResponse, "etsi-data-object-");

     

-    //TODO hotfix

+    //TODO hotfix - already deprecated

     String final_ids =SignatureObject.formatSigIds(response_properties, ids);

     //sigObj.setSignationIDs(ids);

     sigObj.setSignationIDs(final_ids);

@@ -291,11 +295,11 @@ public class BKUConnector implements LocalConnector
     int start_idx = text.indexOf(name) + name.length();

     int end_idx = text.indexOf("\"", start_idx);

     

-    // TODO hotfix!

+    // TODO hotfix! - already deprecated

     final int quot_end_idx = end_idx; 

     final int squot_end_idx = text.indexOf("'", start_idx);

     end_idx = Math.min(quot_end_idx, squot_end_idx);

-    // TODO hotfix end!

+    // TODO hotfix end! - already deprecated

     

     id = text.substring(start_idx, end_idx);

     if (logger_.isDebugEnabled())

@@ -342,7 +346,7 @@ public class BKUConnector implements LocalConnector
     logger_.debug("ids_string = " + ids_string);

     String[] ids = SignatureObject.parseSigIds(ids_string);

 

-    // TODO hotfix

+    // TODO hotfix - already deprecated

     final boolean neue_bku = ids[5] != null;

     logger_.debug("ids[5] = " + ids[5]);

     logger_.debug("neue_bku = " + neue_bku);

@@ -391,7 +395,7 @@ public class BKUConnector implements LocalConnector
     ver_temp_str = ver_temp_str.replaceFirst("TemplateQualifyingPropertiesReplace", sig_prop_str);

     byte[] sig_prop_code = CodingHelper.buildDigest(sig_prop_str.getBytes("UTF-8"));

     

-    // TODO hotfix

+    // TODO hotfix - already deprecated

     if (neue_bku)

     {

       final String ETSI_SIGNED_PROPERTIES_START_TAG = "<etsi:SignedProperties"; // xml name spaces follow, so this is not a complete tag...

@@ -697,7 +701,7 @@ public class BKUConnector implements LocalConnector
   {

     //String sign_request_filename = getSignRequestTemplateFileName(sigType);

 

-    // TODO hotfix

+    // TODO hotfix - already deprecated

     String response_string = response_properties.getProperty("response_string");

     

     SignatureObject sig_obj = new SignatureObject();

@@ -736,15 +740,13 @@ public class BKUConnector implements LocalConnector
         Pattern erm_p_e = Pattern.compile("</[\\w]*:?Info>");

         Matcher erm_m_s = erm_p_s.matcher(response_string);

         Matcher erm_m_e = erm_p_e.matcher(response_string);

-        SignatureException se = new SignatureException(0, "BKUSigExc");

         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 SignatureException(new ExternalErrorException(error_code, error_mess));

       }

       else

       {

@@ -781,18 +783,17 @@ public class BKUConnector implements LocalConnector
         Pattern erm_p_e = Pattern.compile("</[\\w]*:?Info>");

         Matcher erm_m_s = erm_p_s.matcher(response_string);

         Matcher erm_m_e = erm_p_e.matcher(response_string);

-        SignatureException se = new SignatureException(0, "BKUSigExc");

+        String error_code = null;

         if (erc_m_s.find() && erc_m_e.find())

         {

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

-          se.setExternalErrorCode(error_code);

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

         }

+        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 SignatureException(new ExternalErrorException(error_code, error_mess));

       }

       else

       {