Merge dev/fluorine work across to master

[unimgr.git] / impl / src / main / java / org / opendaylight / unimgr / mef / nrp / api / RequestValidator.java

diff --git a/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/api/RequestValidator.java b/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/api/RequestValidator.java
index f418a998f54eda2bef893d1a9695ed7e521cc2b8..914332b51773a6e21011bc1276698d2e12d147fe 100644 (file)
--- a/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/api/RequestValidator.java
+++ b/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/api/RequestValidator.java
@@ -11,14 +11,20 @@ package org.opendaylight.unimgr.mef.nrp.api;
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
+import javax.annotation.Nonnull;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev180307.CreateConnectivityServiceInput;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev180307.UpdateConnectivityServiceInput;
+
 
-import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.tapi.connectivity.rev171113.CreateConnectivityServiceInput;
 
 /**
+ * Simple request validator.
  * @author bartosz.michalik@amartus.com
  */
 public interface RequestValidator {
-    ValidationResult checkValid(CreateConnectivityServiceInput input);
+    @Nonnull ValidationResult checkValid(CreateConnectivityServiceInput input);
+
+    @Nonnull ValidationResult checkValid(UpdateConnectivityServiceInput input);
 
     class ValidationResult {
         private final List<String> problems;
@@ -37,8 +43,16 @@ public interface RequestValidator {
             return new ArrayList<>(problems);
         }
 
-        public boolean isValid() {
-            return problems.isEmpty();
+        public boolean invalid() {
+            return ! problems.isEmpty();
+        }
+
+        public ValidationResult merge(ValidationResult other) {
+            if (other == null) {
+                return this;
+            }
+            this.problems.addAll(other.problems);
+            return this;
         }
     }
 }