1 files changed, 12 insertions, 16 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 874e4f4..a19c06a 100644
--- a/src/main/java/at/gv/egiz/moazs/backend/SignatureVerifier.java
+++ b/src/main/java/at/gv/egiz/moazs/backend/SignatureVerifier.java
@@ -3,7 +3,6 @@ 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;
 
@@ -21,19 +20,17 @@ 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" +
-            "  XmlDSIGManifestCheckCode: %s\n" +
-            "  CertificateCheckCode: %s\n" +
-            "  SignatureCheckCode: %s\n" +
-            "  SigningDateTime: %s\n" +
-            "  isXmlDSIGManigest: %s\n" +
-            "  isPublicAuthority: %s\n" +
-            "  isQualifiedCertificate: %s\n" +
-            "  getPublicAuthorityCode: %s\n";
+            "XmlDsigSubjectName: %s; " +
+            "SignatureManifestCheckCode: %s; " +
+            "XmlDSIGManifestCheckCode: %s; " +
+            "CertificateCheckCode: %s; " +
+            "SignatureCheckCode: %s; " +
+            "SigningDateTime: %s; " +
+            "isXmlDSIGManigest: %s; " +
+            "isPublicAuthority: %s; " +
+            "isQualifiedCertificate: %s; " +
+            "getPublicAuthorityCode: %s; ";
     private static final String MOASIG_SERVICE_ERROR_MSG = "MOA SPSS could not accept the XML signature. ";
 
     private final ISignatureVerificationService service;
@@ -48,8 +45,7 @@ public class SignatureVerifier implements Consumer<byte[]> {
     }
 
     /**
-     * Verifies the signature of a signed XML document. Throws a at.gv.egiz.moazs.MoaZSException exception
-     * if the validation fails.
+     * Verifies the signature of a signed XML document. If the validation fails, it will throw an exception.
      * @param signedXMLdocument
      * @throws at.gv.egiz.moazs.MoaZSException
      */
@@ -107,7 +103,7 @@ public class SignatureVerifier implements Consumer<byte[]> {
 
     public static void debug(IXMLSignatureVerificationResponse response) {
         if (log.isDebugEnabled()) {
-            var builder = new StringBuilder("Response: \n");
+            var builder = new StringBuilder("Response: ");
             if (response == null) {
                 builder.append("null");
             } else {