From fd63db00a873ba082029848041fe28392e496316 Mon Sep 17 00:00:00 2001
From: tkellner <tkellner@174cde9d-5d70-4d2a-aa98-46368bc2aaf7>
Date: Wed, 10 Apr 2013 18:53:55 +0000
Subject: Changed SLRequest interface
git-svn-id: https://joinup.ec.europa.eu/svn/pdf-over/trunk@27 174cde9d-5d70-4d2a-aa98-46368bc2aaf7
---
.../asit/pdfover/signer/pdfas/PDFASSLRequest.java | 35 ++++++----------------
.../at/asit/pdfover/signer/pdfas/PDFASSigner.java | 1 -
2 files changed, 9 insertions(+), 27 deletions(-)
(limited to 'pdf-over-signer/pdf-over-sigpdfas/src')
diff --git a/pdf-over-signer/pdf-over-sigpdfas/src/main/java/at/asit/pdfover/signer/pdfas/PDFASSLRequest.java b/pdf-over-signer/pdf-over-sigpdfas/src/main/java/at/asit/pdfover/signer/pdfas/PDFASSLRequest.java
index 49cb1522..7267db85 100644
--- a/pdf-over-signer/pdf-over-sigpdfas/src/main/java/at/asit/pdfover/signer/pdfas/PDFASSLRequest.java
+++ b/pdf-over-signer/pdf-over-sigpdfas/src/main/java/at/asit/pdfover/signer/pdfas/PDFASSLRequest.java
@@ -26,45 +26,28 @@ import at.asit.pdfover.signator.SLRequest;
/**
* PDF - AS Security Layer Request implementation
*/
-public class PDFASSLRequest implements SLRequest {
+public class PDFASSLRequest extends SLRequest {
/**
* SFL4J Logger instance
**/
- @SuppressWarnings("unused")
private static final Logger log = LoggerFactory.getLogger(PDFASSLRequest.class);
-
- private String request;
-
- private ByteArrayDocumentSource source;
-
+
/**
* Default constructor
* @param slRequest
* @param signData
*/
public PDFASSLRequest(String slRequest, byte[] signData) {
- // Modifing SL Request ...
- this.request = slRequest.replace(PDFASSigner.LOC_REF, SLRequest.DATAOBJECT_STRING);
-
- if(!this.request.contains(DATAOBJECT_STRING)) {
+ if(!slRequest.contains(PDFASSigner.LOC_REF)) {
// TODO: throw Exception (Failed to prepare SL Request)
+ log.error("PDF-AS SL request doesn't contain " + PDFASSigner.LOC_REF);
+ log.debug("Request: " + slRequest);
}
-
- this.source = new ByteArrayDocumentSource(signData);
- }
-
- @Override
- public DocumentSource getSignatureData() {
- return this.source;
- }
- /* (non-Javadoc)
- * @see at.asit.pdfover.signator.SLRequest#getRequest()
- */
- @Override
- public String getRequest() {
- return this.request;
- }
+ // Modifing SL Request ...
+ setRequest(slRequest.replace(PDFASSigner.LOC_REF, SLRequest.DATAOBJECT_STRING));
+ setSignatureData(new ByteArrayDocumentSource(signData));
+ }
}
diff --git a/pdf-over-signer/pdf-over-sigpdfas/src/main/java/at/asit/pdfover/signer/pdfas/PDFASSigner.java b/pdf-over-signer/pdf-over-sigpdfas/src/main/java/at/asit/pdfover/signer/pdfas/PDFASSigner.java
index d1336d91..a2f34e9a 100644
--- a/pdf-over-signer/pdf-over-sigpdfas/src/main/java/at/asit/pdfover/signer/pdfas/PDFASSigner.java
+++ b/pdf-over-signer/pdf-over-sigpdfas/src/main/java/at/asit/pdfover/signer/pdfas/PDFASSigner.java
@@ -12,7 +12,6 @@ import at.asit.pdfover.signator.SigningState;
import at.gv.egiz.pdfas.api.PdfAs;
import at.gv.egiz.pdfas.api.sign.SignParameters;
import at.gv.egiz.pdfas.api.sign.SignatureDetailInformation;
-import at.gv.egiz.pdfas.framework.input.DataSource;
import at.gv.egiz.pdfas.io.ByteArrayDataSink;
import at.gv.egiz.pdfas.api.commons.Constants;
import at.gv.egiz.pdfas.api.exceptions.PdfAsException;
--
cgit v1.2.3