YAGNI: SLRequest abstraction

2 files changed, 12 insertions, 13 deletions

diff --git a/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4SLRequest.java b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4SLRequest.java
index 87b97ac9..20c919f2 100644
--- a/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4SLRequest.java
+++ b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4SLRequest.java
@@ -16,23 +16,23 @@
 package at.asit.pdfover.signer.pdfas;
 
 // Imports
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import at.asit.pdfover.signator.ByteArrayDocumentSource;
-import at.asit.pdfover.signator.SLRequest;
 import at.asit.pdfover.signer.pdfas.exceptions.PdfAs4SLRequestException;
 
 /**
  * PDF - AS Security Layer Request implementation
  */
-public class PdfAs4SLRequest extends SLRequest {
+public class PdfAs4SLRequest {
 
 	/**
-	 * SLF4J Logger instance
-	 **/
-	@SuppressWarnings("unused")
-	private static final Logger log = LoggerFactory.getLogger(PdfAs4SLRequest.class);
+	 * The security layer request
+	 */
+	public final String request;
+
+	/**
+	 * The document to be signed
+	 */
+	public final ByteArrayDocumentSource signatureData;
 
 	/**
 	 * Default constructor
@@ -41,7 +41,7 @@ public class PdfAs4SLRequest extends SLRequest {
 	 * @throws PdfAs4SLRequestException
 	 */
 	public PdfAs4SLRequest(String slRequest, byte[] signData) throws PdfAs4SLRequestException {
-		setRequest(slRequest);
-		setSignatureData(signData == null ? null : new ByteArrayDocumentSource(signData));
+		this.request = slRequest;
+		this.signatureData = (signData == null ? null : new ByteArrayDocumentSource(signData));
 	}
 }
diff --git a/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4SigningState.java b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4SigningState.java
index 5312e582..2192f380 100644
--- a/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4SigningState.java
+++ b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4SigningState.java
@@ -19,7 +19,6 @@ package at.asit.pdfover.signer.pdfas;
 import java.io.ByteArrayOutputStream;
 
 import at.asit.pdfover.signator.BkuSlConnector;
-import at.asit.pdfover.signator.SLRequest;
 import at.asit.pdfover.signator.SignatureException;
 import at.gv.egiz.pdfas.common.exceptions.PDFASError;
 import at.gv.egiz.pdfas.lib.api.sign.IPlainSigner;
@@ -34,7 +33,7 @@ public class PdfAs4SigningState {
 	/**
 	 * The Signature Layer request
 	 */
-	public SLRequest signatureRequest;
+	public PdfAs4SLRequest signatureRequest;
 
 	/**
 	 * The Signature Layer response