some code optimization to reduce memory consumption

2 files changed, 26 insertions, 2 deletions

diff --git a/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eaaf/modules/sigverify/moasig/impl/data/GenericSignatureVerificationResponse.java b/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eaaf/modules/sigverify/moasig/impl/data/GenericSignatureVerificationResponse.java
index 28501c54..6006b731 100644
--- a/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eaaf/modules/sigverify/moasig/impl/data/GenericSignatureVerificationResponse.java
+++ b/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eaaf/modules/sigverify/moasig/impl/data/GenericSignatureVerificationResponse.java
@@ -3,6 +3,7 @@ package at.gv.egiz.eaaf.modules.sigverify.moasig.impl.data;
 import java.io.Serializable;
 import java.security.cert.CertificateException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
@@ -54,7 +55,7 @@ public class GenericSignatureVerificationResponse
   
   private ExtendedCertificateValidation extendedCertificateValidation;
   
-  private List<ExtendedResult> formValidationResults = new ArrayList<>();
+  private List<ExtendedResult> formValidationResults = null;
   
   @Override
   public Date getSigningDateTime() {
@@ -105,6 +106,17 @@ public class GenericSignatureVerificationResponse
 
   }
 
+  @Override
+  public List<ExtendedResult> getFormValidationResults() {
+    if (formValidationResults == null) {
+      return Collections.emptyList();      
+      
+    } else {
+      return formValidationResults;
+      
+    }    
+  }
+  
   /**
    * Set signature creation timestramp.
    * 
@@ -161,7 +173,13 @@ public class GenericSignatureVerificationResponse
     if (formCheckResult != null) {
       for (Object elObj : formCheckResult) {
         if (elObj instanceof AdESFormResults) {
-          AdESFormResults el = (AdESFormResults)elObj; 
+          AdESFormResults el = (AdESFormResults)elObj;
+          
+          if (formValidationResults == null) {
+            formValidationResults = new ArrayList<>();
+            
+          }
+          
           formValidationResults.add(ExtendedResult.builder()
               .code(el.getCode())
               .info(el.getName())
diff --git a/eaaf_modules/eaaf_module_pvp2_core/pom.xml b/eaaf_modules/eaaf_module_pvp2_core/pom.xml
index ee20ef56..1ce539ee 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/pom.xml
+++ b/eaaf_modules/eaaf_module_pvp2_core/pom.xml
@@ -56,6 +56,12 @@
     <dependency>
       <groupId>org.cryptacular</groupId>
       <artifactId>cryptacular</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.bouncycastle</groupId>
+          <artifactId>bcprov-jdk15on</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>