refact(core): some code clean-up

2 files changed, 8 insertions, 10 deletions

diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvoker.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvoker.java
index 1a0791b..19b3a12 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvoker.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvoker.java
@@ -86,7 +86,7 @@ public class CMSSignatureVerificationInvoker {
 
   /**
    * Return the only instance of this class.
-   * 
+   *
    * @return The only instance of this class.
    */
   public static synchronized CMSSignatureVerificationInvoker getInstance() {
@@ -98,7 +98,7 @@ public class CMSSignatureVerificationInvoker {
 
   /**
    * Create a new <code>CMSSignatureVerificationInvoker</code>.
-   * 
+   *
    * Protected to disallow multiple instances.
    */
   protected CMSSignatureVerificationInvoker() {
@@ -106,7 +106,7 @@ public class CMSSignatureVerificationInvoker {
 
   /**
    * Verify a CMS signature.
-   * 
+   *
    * @param request The <code>VerifyCMSSignatureRequest</code> containing the CMS
    *                signature, as well as additional data needed for verification.
    * @return Element A <code>VerifyCMSSignatureResponse</code> containing the
@@ -118,7 +118,7 @@ public class CMSSignatureVerificationInvoker {
 
     final CMSSignatureVerificationProfileFactory profileFactory = new CMSSignatureVerificationProfileFactory(
         request);
-    final VerifyCMSSignatureResponseBuilder responseBuilder = new VerifyCMSSignatureResponseBuilder();
+
     final TransactionContext context = TransactionContextManager.getInstance().getTransactionContext();
     final LoggingContext loggingCtx = LoggingContextManager.getInstance().getLoggingContext();
     InputStream signature;
@@ -219,7 +219,7 @@ public class CMSSignatureVerificationInvoker {
       }
     }
 
-    final QCSSCDResult qcsscdresult = new QCSSCDResult();
+    final VerifyCMSSignatureResponseBuilder responseBuilder = new VerifyCMSSignatureResponseBuilder();
 
     // build the response: for each signatory add the result to the response
     signatories = request.getSignatories();
@@ -402,8 +402,8 @@ public class CMSSignatureVerificationInvoker {
           i++;
         }
 
-        qcsscdresult = CertificateUtils.checkQCSSCD(chain, cmsResult.getSigningTime(), trustProfile
-            .isTSLEnabled(), ConfigurationProvider.getInstance());
+        qcsscdresult = CertificateUtils.checkQCSSCD(chain, cmsResult.getSigningTime(),
+            trustProfile.isTSLEnabled(), ConfigurationProvider.getInstance());
 
         // get signer certificate issuer country code
         issuerCountryCode = CertificateUtils.getIssuerCountry((X509Certificate) list.get(0));
@@ -419,7 +419,7 @@ public class CMSSignatureVerificationInvoker {
   /**
    * Get the signed content contained either in the request itself or given as a
    * reference to external data.
-   * 
+   *
    * @param request The <code>VerifyCMSSignatureRequest</code> containing the
    *                signed content (or the reference to the signed content).
    * @return InputStream A stream providing the signed content data, or
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/util/CertificateUtils.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/util/CertificateUtils.java
index b7580ac..35dca16 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/util/CertificateUtils.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/util/CertificateUtils.java
@@ -204,7 +204,6 @@ public class CertificateUtils {
           // QC evaluation flags
           boolean qc = false;
           boolean qcSourceTSL = false;
-          boolean qcDisallowedFromTSL = false;
 
           // SSCD/QSCD evaluation flags
           boolean sscd = false;
@@ -254,7 +253,6 @@ public class CertificateUtils {
                       TslConstants.SSCD_QUALIFIER_SHORT.NotQualified))) {
                 qc = false;
                 qcSourceTSL = false;
-                qcDisallowedFromTSL = true;
                 Logger.info("TSL mark this certificate explicitly as 'NotQualified'!");
 
               }