Code Review
/
policy
/
engine.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fixed the Policy API issues and Bugfixes
[policy/engine.git]
/
ECOMP-ControlloopPolicy
/
src
/
main
/
java
/
org
/
openecomp
/
policy
/
controlloop
/
policy
/
guard
/
Constraint.java
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
85ddf06
..
42a04e7
100644
(file)
--- 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);
}
this.blacklist = new LinkedList<>(blacklist);
}
+
+ public Constraint(Map<String, String> time_in_range, List<String> 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<String> blacklist) {
this.num = num;
public Constraint(Integer num, String duration, List<String> blacklist) {
this.num = num;
@@
-84,6
+91,13
@@
public class Constraint {
this.blacklist = new LinkedList<>(blacklist);
}
this.blacklist = new LinkedList<>(blacklist);
}
+ public Constraint(Integer num, String duration, Map<String, String> 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<String, String> time_in_range, List<String> blacklist) {
this(num, duration);
if (time_in_range != null) {
public Constraint(Integer num, String duration, Map<String, String> time_in_range, List<String> blacklist) {
this(num, duration);
if (time_in_range != null) {
@@
-102,13
+116,7
@@
public class Constraint {
}
public boolean isValid() {
}
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
}
@Override