Add validation context to case and process validator validate method

Author: tijsrademakers

modules/flowable-case-validation/src/main/java/org/flowable/cmmn/validation/CaseValidationContext.java

@@ -12,15 +12,20 @@
  */
 package org.flowable.cmmn.validation;
 
+import java.util.List;
+
 import org.flowable.cmmn.model.BaseElement;
 import org.flowable.cmmn.model.Case;
 import org.flowable.cmmn.model.CaseElement;
 import org.flowable.cmmn.validation.validator.ValidationEntry;
+import org.flowable.cmmn.validation.validator.ValidatorSet;
 
 /**
  * @author Filip Hrisafov
  */
 public interface CaseValidationContext {
+    
+    List<ValidationEntry> getEntries();
 
     default ValidationEntry addError(String problem, String description) {
         return addError(problem, null, null, null, description);
@@ -68,5 +73,7 @@ default ValidationEntry addEntry(String problem, Case caze, CaseElement caseElem
     }
 
     ValidationEntry addEntry(ValidationEntry entry);
+    
+    void setCurrentValidatorSet(ValidatorSet validatorSet);
 
 }

modules/flowable-case-validation/src/main/java/org/flowable/cmmn/validation/CaseValidationContextImpl.java

@@ -23,7 +23,7 @@
  */
 public class CaseValidationContextImpl implements CaseValidationContext {
 
-    protected final ValidatorSet validatorSet;
+    protected ValidatorSet validatorSet;
     protected final List<ValidationEntry> entries = new ArrayList<>();
 
     public CaseValidationContextImpl(ValidatorSet validatorSet) {
@@ -36,7 +36,13 @@ public ValidationEntry addEntry(ValidationEntry entry) {
         entries.add(entry);
         return entry;
     }
+    
+    @Override
+    public void setCurrentValidatorSet(ValidatorSet validatorSet) {
+        this.validatorSet = validatorSet;
+    }
 
+    @Override
     public List<ValidationEntry> getEntries() {
         return entries;
     }

modules/flowable-case-validation/src/main/java/org/flowable/cmmn/validation/CaseValidator.java

@@ -26,6 +26,8 @@
 public interface CaseValidator {
 
     List<ValidationEntry> validate(CmmnModel model);
+    
+    List<ValidationEntry> validate(CmmnModel model, CaseValidationContext validationContext);
 
     List<ValidatorSet> getValidatorSets();
 }

modules/flowable-case-validation/src/main/java/org/flowable/cmmn/validation/CaseValidatorImpl.java

@@ -32,21 +32,34 @@ public class CaseValidatorImpl implements CaseValidator {
 
     @Override
     public List<ValidationEntry> validate(CmmnModel model) {
+        return validate(model, null);
+    }
+
+    @Override
+    public List<ValidationEntry> validate(CmmnModel model, CaseValidationContext validationContext) {
         List<ValidationEntry> allEntries = new ArrayList<>();
 
+        CaseValidationContext currentValidationContext = validationContext;
         for (ValidatorSet validatorSet : validatorSets) {
-            CaseValidationContextImpl validationContext = new CaseValidationContextImpl(validatorSet);
+            if (currentValidationContext == null) {
+                currentValidationContext = new CaseValidationContextImpl(validatorSet);
+                
+            } else {
+                currentValidationContext.setCurrentValidatorSet(validatorSet);
+            }
 
             for (Validator validator : validatorSet.getValidators()) {
-                validator.validate(model, validationContext);
+                validator.validate(model, currentValidationContext);
             }
 
-            allEntries.addAll(validationContext.getEntries());
+            allEntries.addAll(currentValidationContext.getEntries());
         }
 
         return allEntries;
     }
 
+
+
     @Override
     public List<ValidatorSet> getValidatorSets() {
         return validatorSets;

modules/flowable-engine/src/test/java/org/flowable/engine/test/regression/FlowableTestCaseProcessValidator.java

@@ -19,6 +19,7 @@
 import org.flowable.bpmn.model.FlowElement;
 import org.flowable.bpmn.model.Process;
 import org.flowable.bpmn.model.ServiceTask;
+import org.flowable.validation.ProcessValidationContext;
 import org.flowable.validation.ProcessValidator;
 import org.flowable.validation.ValidationError;
 import org.flowable.validation.validator.ValidatorSet;
@@ -30,6 +31,11 @@ public class FlowableTestCaseProcessValidator implements ProcessValidator {
 
     @Override
     public List<ValidationError> validate(BpmnModel bpmnModel) {
+        return validate(bpmnModel, null);
+    }
+
+    @Override
+    public List<ValidationError> validate(BpmnModel bpmnModel, ProcessValidationContext validationContext) {
         List<ValidationError> errorList = new ArrayList<>();
         CustomParseValidator customParseValidator = new CustomParseValidator();
 

modules/flowable-process-validation/src/main/java/org/flowable/validation/ProcessValidationContext.java

@@ -12,14 +12,19 @@
  */
 package org.flowable.validation;
 
+import java.util.List;
+
 import org.flowable.bpmn.model.BaseElement;
 import org.flowable.bpmn.model.FlowElement;
 import org.flowable.bpmn.model.Process;
+import org.flowable.validation.validator.ValidatorSet;
 
 /**
  * @author Tijs Rademakers
  */
 public interface ProcessValidationContext {
+    
+    List<ValidationError> getEntries();
 
     default ValidationError addError(String problem, String description) {
         return addError(problem, null, null, null, description, false);
@@ -98,5 +103,7 @@ default ValidationError addError(String problem, Process process, String id, Str
     }
 
     ValidationError addEntry(ValidationError entry);
+    
+    void setCurrentValidatorSet(ValidatorSet validatorSet);
 
 }

modules/flowable-process-validation/src/main/java/org/flowable/validation/ProcessValidationContextImpl.java

@@ -22,7 +22,7 @@
  */
 public class ProcessValidationContextImpl implements ProcessValidationContext {
 
-    protected final ValidatorSet validatorSet;
+    protected ValidatorSet validatorSet;
     protected final List<ValidationError> entries = new ArrayList<>();
 
     public ProcessValidationContextImpl(ValidatorSet validatorSet) {
@@ -36,6 +36,12 @@ public ValidationError addEntry(ValidationError entry) {
         return entry;
     }
 
+    @Override
+    public void setCurrentValidatorSet(ValidatorSet validatorSet) {
+        this.validatorSet = validatorSet;
+    }
+
+    @Override
     public List<ValidationError> getEntries() {
         return entries;
     }

modules/flowable-process-validation/src/main/java/org/flowable/validation/ProcessValidator.java

@@ -28,6 +28,11 @@ public interface ProcessValidator {
      * Validates the provided {@link BpmnModel} and returns a list of all {@link ValidationError} occurrences found.
      */
     List<ValidationError> validate(BpmnModel bpmnModel);
+    
+    /**
+     * Validates the provided {@link BpmnModel} and returns a list of all {@link ValidationError} occurrences found.
+     */
+    List<ValidationError> validate(BpmnModel bpmnModel, ProcessValidationContext validationContext);
 
     /**
      * Returns the {@link ValidatorSet} instances for this process validator. Useful if some validation rules need to be disabled.

modules/flowable-process-validation/src/main/java/org/flowable/validation/ProcessValidatorImpl.java

@@ -28,16 +28,27 @@ public class ProcessValidatorImpl implements ProcessValidator {
 
     @Override
     public List<ValidationError> validate(BpmnModel bpmnModel) {
+        return validate(bpmnModel, null);
+    }
+
+    @Override
+    public List<ValidationError> validate(BpmnModel bpmnModel, ProcessValidationContext validationContext) {
         List<ValidationError> allErrors = new ArrayList<>();
 
+        ProcessValidationContext currentValidationContext = validationContext;;
         for (ValidatorSet validatorSet : validatorSets) {
-            ProcessValidationContextImpl validationContext = new ProcessValidationContextImpl(validatorSet);
+            if (currentValidationContext == null) {
+                currentValidationContext = new ProcessValidationContextImpl(validatorSet);
+                
+            } else {
+                currentValidationContext.setCurrentValidatorSet(validatorSet);
+            }
 
             for (Validator validator : validatorSet.getValidators()) {
-                validator.validate(bpmnModel, validationContext);
+                validator.validate(bpmnModel, currentValidationContext);
             }
 
-            allErrors.addAll(validationContext.getEntries());
+            allErrors.addAll(currentValidationContext.getEntries());
         }
 
         return allErrors;

modules/flowable5-test/src/test/java/org/activiti/engine/test/regression/ActivitiTestCaseProcessValidator.java

@@ -19,6 +19,7 @@
 import org.flowable.bpmn.model.FlowElement;
 import org.flowable.bpmn.model.Process;
 import org.flowable.bpmn.model.ServiceTask;
+import org.flowable.validation.ProcessValidationContext;
 import org.flowable.validation.ProcessValidator;
 import org.flowable.validation.ValidationError;
 import org.flowable.validation.validator.ValidatorSet;
@@ -30,6 +31,12 @@ public class ActivitiTestCaseProcessValidator implements ProcessValidator {
 
     @Override
     public List<ValidationError> validate(BpmnModel bpmnModel) {
+        return validate(bpmnModel, null);
+    }
+    
+
+    @Override
+    public List<ValidationError> validate(BpmnModel bpmnModel, ProcessValidationContext validationContext) {
         List<ValidationError> errorList = new ArrayList<ValidationError>();
         CustomParseValidator customParseValidator = new CustomParseValidator();
 
@@ -47,6 +54,7 @@ public List<ValidationError> validate(BpmnModel bpmnModel) {
         return errorList;
     }
 
+
     @Override
     public List<ValidatorSet> getValidatorSets() {
         return null;