1 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/at/gv/egiz/moazs/backend/SignatureVerifier.java b/src/main/java/at/gv/egiz/moazs/backend/SignatureVerifier.java
index f9bbeb3..874e4f4 100644
--- a/src/main/java/at/gv/egiz/moazs/backend/SignatureVerifier.java
+++ b/src/main/java/at/gv/egiz/moazs/backend/SignatureVerifier.java
@@ -3,13 +3,13 @@ package at.gv.egiz.moazs.backend;
 import at.gv.egiz.eid.authhandler.modules.sigverify.moasig.api.ISignatureVerificationService;
 import at.gv.egiz.eid.authhandler.modules.sigverify.moasig.api.data.IXMLSignatureVerificationResponse;
 import at.gv.egiz.eid.authhandler.modules.sigverify.moasig.exceptions.MOASigServiceException;
+import at.gv.egiz.moazs.MoaZSException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.function.Consumer;
 
 import static at.gv.egiz.moazs.MoaZSException.moaZSException;
-import static at.gv.egiz.moazs.MoaZSException.moaZSExceptionBuilder;
 import static java.lang.String.format;
 
 public class SignatureVerifier implements Consumer<byte[]> {
@@ -21,6 +21,8 @@ public class SignatureVerifier implements Consumer<byte[]> {
     private static final String CERT_CODE_ERROR_MSG = "Certificate chain is not valid: Check code was %d. ";
     private static final String MANIFEST_CODE_ERROR_MSG = "Signature Manifest is not valid: Check code was %d. ";
     private static final String XMLMANIFEST_CODE_ERROR_MSG = "XmlDSIGManifest is not valid: Check code was %d. ";
+
+    //TODO: Dont make this multiline!
     private static final String XML_SIGNATURE_RESPONSE_TEMPLATE =
             "  XmlDsigSubjectName: %s\n" +
             "  SignatureManifestCheckCode: %s\n" +
@@ -93,14 +95,12 @@ public class SignatureVerifier implements Consumer<byte[]> {
 
             var msg = builder.toString();
 
-            if(msg.length() > 0) {
+            if(!msg.isEmpty()) {
                 throw moaZSException(msg);
             }
 
         } catch (MOASigServiceException e) {
-            throw moaZSExceptionBuilder(MOASIG_SERVICE_ERROR_MSG)
-                    .withCause(e)
-                    .build();
+            throw moaZSException(MOASIG_SERVICE_ERROR_MSG, e);
         }
 
     }