Necessary changes for separation of pdf-as-web and rest of the project

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

1 files changed, 9 insertions, 23 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 ac6e221..da98d47 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
@@ -14,8 +14,6 @@ import java.util.TimeZone;
 import java.util.regex.Matcher;

 import java.util.regex.Pattern;

 

-import javax.servlet.http.HttpServletRequest;

-

 import org.apache.commons.lang.StringUtils;

 import org.apache.commons.logging.Log;

 import org.apache.commons.logging.LogFactory;

@@ -24,6 +22,7 @@ import at.gv.egiz.pdfas.algorithmSuite.AlgorithmMapper;
 import at.gv.egiz.pdfas.algorithmSuite.AlgorithmSuiteObject;

 import at.gv.egiz.pdfas.algorithmSuite.AlgorithmSuiteUtil;

 import at.gv.egiz.pdfas.api.commons.Constants;

+import at.gv.egiz.pdfas.api.internal.LocalBKUParams;

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

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

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

@@ -626,6 +625,11 @@ public final class BKUHelper
      String bkuUserAgentHeader = parsedResponseProperties.getProperty(BKUPostConnection.BKU_USER_AGENT_HEADER_KEY);

      

      String bkuSignatureLayout = parsedResponseProperties.getProperty(BKUPostConnection.BKU_SIGNATURE_LAYOUT_HEADER_KEY);

+     

+     return getBKUIdentifier(bkuServerHeader, bkuUserAgentHeader, bkuSignatureLayout);

+  }

+  

+  public static String getBKUIdentifier(String bkuServerHeader, String bkuUserAgentHeader, String bkuSignatureLayout) {

 

      log.debug("BKU response header \"user-agent\":  " + bkuUserAgentHeader);

      log.debug("BKU response header \"server\":  " + bkuServerHeader);

@@ -660,27 +664,9 @@ public final class BKUHelper
      

      return result;

   }

-  

-  public static String getBKUIdentifier(HttpServletRequest request) {

-     return getBKUIdentifier(getBKUProperties(request));

-  }

-  

-  public static Properties getBKUProperties(HttpServletRequest request) {

-     Properties props = new Properties();

-     String server = request.getHeader("server");

-     String userAgent = request.getHeader("user-agent");

-     String signatureLayout = request.getHeader(Constants.BKU_HEADER_SIGNATURE_LAYOUT);

-     if (server != null) {

-        props.setProperty(BKUPostConnection.BKU_SERVER_HEADER_KEY, server);

-     }

-     if (userAgent != null) {

-        props.setProperty(BKUPostConnection.BKU_USER_AGENT_HEADER_KEY, userAgent);

-     }

-     if (signatureLayout != null) {

-        props.setProperty(BKUPostConnection.BKU_SIGNATURE_LAYOUT_HEADER_KEY, signatureLayout);

-     }

-     return props;

+

+  public static String getBKUIdentifier(LocalBKUParams bkuParams) {

+    return getBKUIdentifier(bkuParams.getServer(), bkuParams.getUserAgent(), bkuParams.getSignatureLayout());

   }

   

-  

 }