Changeset 17481 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/ConcreteRestrictedArrayJsonItem.cs

Timestamp:

03/17/20 17:03:24 (4 years ago)

Author:

dpiringe

Message:

#3026:

• refactored json item validation process -> every method now returns a ValidationResult containing bool Success (true if validation is successful) and IEnumerable<string> Errors (error messages)
  • this design allows to specify error messages directly in json items

File:

• branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/ConcreteRestrictedArrayJsonItem.cs (modified) (2 diffs)

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/ConcreteRestrictedArrayJsonItem.cs

@@ -9 +9 @@
     public IEnumerable<T> ConcreteRestrictedItems { get; set; }
 
-    protected override bool Validate() {
+    protected override ValidationResult Validate() {
       bool res = true;
+      IList<string> errors = new List<string>();
       foreach(var x in Value) {
         bool tmp = false;
@@ -16 +17 @@
           tmp = tmp || x.Equals(restrictedItem); //if one tmp is true, it stays true (match found)
         }
+        if (!tmp)
+          errors.Add($"[{Path}]: Value '{x}' is not one of the allowed values: " +
+                     $"'{ string.Join(",", ConcreteRestrictedItems.Select(s => s.ToString()).ToArray()) }'.");
         res = res && tmp; //if one tmp is false, res will set false
       }
-      return res;
+      if (res) 
+        return ValidationResult.Successful();
+      else 
+        return ValidationResult.Faulty(errors);
     }
   }