PDF-AS Errorhandling redesign only PDFASError Exceptions are returned

!

4 files changed, 140 insertions, 10 deletions

diff --git a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/exceptions/ErrorConstants.java b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/exceptions/ErrorConstants.java
new file mode 100644
index 00000000..04314c6c
--- /dev/null
+++ b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/exceptions/ErrorConstants.java
@@ -0,0 +1,20 @@
+package at.gv.egiz.pdfas.common.exceptions;
+
+public interface ErrorConstants {
+	// Code below 10000 are reserved for SL Error Codes
+	
+	public static final long ERROR_GENERIC = 10000;
+	public static final long ERROR_NO_INPUT = 10001;
+	
+	// Signature Errors
+	public static final long ERROR_SIG_INVALID_STATUS = 11004;
+	public static final long ERROR_SIG_INVALID_BKU_SIG = 11008;
+	public static final long ERROR_SIG_INVALID_PROFILE = 11009;
+
+	public static final long ERROR_SIG_CERTIFICATE_MISSMATCH = 11019;
+	
+	// Verification Errors
+	
+	// Configuration Errors:
+	public static final long ERROR_SET_INVALID_SETTINGS_OBJ = 13001;
+}
diff --git a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/exceptions/PDFASError.java b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/exceptions/PDFASError.java
new file mode 100644
index 00000000..8a6d7379
--- /dev/null
+++ b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/exceptions/PDFASError.java
@@ -0,0 +1,90 @@
+package at.gv.egiz.pdfas.common.exceptions;
+
+import at.gv.egiz.pdfas.common.messages.ErrorCodeResolver;
+
+/**
+ * The Class PDFASError.
+ */
+public class PDFASError extends Exception {
+
+	/** The Constant serialVersionUID. */
+	private static final long serialVersionUID = 1233586898708485346L;
+	
+	/** The code. */
+	private long code;
+	
+	/**
+	 * Instantiates a new PDFAS error.
+	 *
+	 * @param code the code
+	 */
+	public PDFASError(long code) {
+		super(ErrorCodeResolver.resolveMessage(code));
+		this.code = code;
+	}
+	
+	/**
+	 * Instantiates a new PDFAS error.
+	 *
+	 * @param code the code
+	 * @param e the e
+	 */
+	public PDFASError(long code, Throwable e) {
+		super(ErrorCodeResolver.resolveMessage(code), e);
+		this.code = code;
+	}
+	
+	/**
+	 * Instantiates a new PDFAS error.
+	 *
+	 * @param code the code
+	 * @param info the info
+	 * @param e the e
+	 */
+	public PDFASError(long code, String info, Throwable e) {
+		super(info, e);
+		this.code = code;
+	}
+	
+	/**
+	 * Instantiates a new PDFAS error.
+	 *
+	 * @param code the code
+	 * @param info the info
+	 */
+	public PDFASError(long code, String info) {
+		super(info);
+		this.code = code;
+	}
+
+	/**
+	 * Gets the code.
+	 *
+	 * @return the code
+	 */
+	public long getCode() {
+		return code;
+	}
+	
+	/**
+	 * Gets the info.
+	 *
+	 * @return the info
+	 */
+	public String getInfo() {
+		return this.getMessage();
+	}
+	
+	/**
+	 * Gets the code info.
+	 *
+	 * @return the code info
+	 */
+	public String getCodeInfo() {
+		return ErrorCodeResolver.resolveMessage(code);
+	}
+	
+	public static String buildInfoString(long code, Object ... args) {
+		return String.format(ErrorCodeResolver.resolveMessage(code), args);
+	}
+}
diff --git a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/exceptions/PdfAsErrorCarrier.java b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/exceptions/PdfAsErrorCarrier.java
new file mode 100644
index 00000000..f5c2fa9d
--- /dev/null
+++ b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/exceptions/PdfAsErrorCarrier.java
@@ -0,0 +1,14 @@
+package at.gv.egiz.pdfas.common.exceptions;
+
+public class PdfAsErrorCarrier extends PdfAsException {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 8823547416257994310L;
+
+	public PdfAsErrorCarrier(PDFASError error) {
+		super("Carrier", error);
+	}
+	
+}
diff --git a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/exceptions/SLPdfAsException.java b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/exceptions/SLPdfAsException.java
index 64536ea4..a0ee44d9 100644
--- a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/exceptions/SLPdfAsException.java
+++ b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/exceptions/SLPdfAsException.java
@@ -23,7 +23,6 @@
  ******************************************************************************/
 package at.gv.egiz.pdfas.common.exceptions;
 
-
 public class SLPdfAsException extends PdfAsException {
 
 	/**
@@ -33,15 +32,22 @@ public class SLPdfAsException extends PdfAsException {
 
 	private int code;
 	private String info;
-	
+
 	public SLPdfAsException(int code, String info) {
-        super();
-        this.code = code;
-        this.info = info;
-    }
-	
-	
+		super();
+		this.code = code;
+		this.info = info;
+	}
+
+	public int getCode() {
+		return code;
+	}
+
+	public String getInfo() {
+		return info;
+	}
+
 	protected String localizeMessage(String msgId) {
-        return String.format("%d : %s", code, info);
-    }
+		return String.format("%d : %s", code, info);
+	}
 }