X-Git-Url: https://gerrit.onap.org/r/gitweb?p=policy%2Fengine.git;a=blobdiff_plain;f=ECOMP-ControlloopPolicy%2Fsrc%2Fmain%2Fjava%2Forg%2Fopenecomp%2Fpolicy%2Fcontrolloop%2Fpolicy%2Fguard%2FConstraint.java;h=42a04e7b723c439deb18fc89f16e9b1a5b728711;hp=85ddf066df9750ee141447b144ec3023763e5020;hb=fc5c07705edc4dcb7083b39116a43844bb6a1490;hpb=d9007d680d19734d5dc106479784c420236cca4b diff --git a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/guard/Constraint.java b/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/guard/Constraint.java index 85ddf066d..42a04e7b7 100644 --- a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/guard/Constraint.java +++ b/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/guard/Constraint.java @@ -77,6 +77,13 @@ public class Constraint { this.blacklist = new LinkedList<>(blacklist); } + + public Constraint(Map time_in_range, List blacklist) { + if (time_in_range != null) { + this.time_in_range = Collections.unmodifiableMap(time_in_range); + } + this.blacklist = new LinkedList<>(blacklist); + } public Constraint(Integer num, String duration, List blacklist) { this.num = num; @@ -84,6 +91,13 @@ public class Constraint { this.blacklist = new LinkedList<>(blacklist); } + public Constraint(Integer num, String duration, Map time_in_range) { + this(num, duration); + if (time_in_range != null) { + this.time_in_range = Collections.unmodifiableMap(time_in_range); + } + } + public Constraint(Integer num, String duration, Map time_in_range, List blacklist) { this(num, duration); if (time_in_range != null) { @@ -102,13 +116,7 @@ public class Constraint { } public boolean isValid() { - if (num == null && duration != null) { - return false; - } - if (duration == null && num != null) { - return false; - } - return true; + return ((num == null && duration != null)|| (duration == null && num != null))? false : true; } @Override