X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ECOMP-ControlloopPolicy%2Fsrc%2Fmain%2Fjava%2Forg%2Fopenecomp%2Fpolicy%2Fcontrolloop%2Fpolicy%2Fguard%2FConstraint.java;h=42a04e7b723c439deb18fc89f16e9b1a5b728711;hb=fc5c07705edc4dcb7083b39116a43844bb6a1490;hp=7d7991787e4386e4a84b1e711f31adc14d80cb63;hpb=dda032f8bb161d54eb1f59de2b4a3efb774fc4d1;p=policy%2Fengine.git

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 7d7991787..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
@@ -26,37 +26,76 @@ import java.util.Map;
 
 public class Constraint {
 
-	public Integer num;
-	public String duration;
-	public Map<String, String> time_in_range;
+	private Integer num;
+	private String duration;
+	private Map<String, String> time_in_range;
 	
-	public LinkedList<String> blacklist;
+	private List<String> blacklist;
 	
 	public Constraint() {
-		
+		// Do Nothing empty constructor. 
 	}
 	
+	public Integer getNum() {
+		return num;
+	}
+
+	public void setNum(Integer num) {
+		this.num = num;
+	}
+
+	public String getDuration() {
+		return duration;
+	}
+
+	public void setDuration(String duration) {
+		this.duration = duration;
+	}
+
+	public Map<String, String> getTime_in_range() {
+		return time_in_range;
+	}
+
+	public void setTime_in_range(Map<String, String> time_in_range) {
+		this.time_in_range = time_in_range;
+	}
+
+	public List<String> getBlacklist() {
+		return blacklist;
+	}
+
+	public void setBlacklist(List<String> blacklist) {
+		this.blacklist = blacklist;
+	}
+
 	public Constraint(Integer num, String duration) {
 		this.num = num;
 		this.duration = duration;
 	}
 	
 	public Constraint(List<String> blacklist) {
-		this.blacklist = new LinkedList<String>(blacklist);
+		this.blacklist = new LinkedList<>(blacklist);
 		
 	}
-	
-	public Constraint(Integer num, String duration, Map<String, String> time_in_range) {
-		this(num, duration);
+
+	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;
 		this.duration = duration;
-		this.blacklist = new LinkedList<String>(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) {
@@ -64,7 +103,7 @@ public class Constraint {
 		if (time_in_range != null) {
 			this.time_in_range = Collections.unmodifiableMap(time_in_range);
 		}
-		this.blacklist = new LinkedList<String>(blacklist);
+		this.blacklist = new LinkedList<>(blacklist);
 	}
 	
 	public Constraint(Constraint constraint) {
@@ -73,21 +112,11 @@ public class Constraint {
 		if (constraint.time_in_range != null) {
 			this.time_in_range = Collections.unmodifiableMap(constraint.time_in_range);
 		}
-		this.blacklist = new LinkedList<String>(constraint.blacklist);
+		this.blacklist = new LinkedList<>(constraint.blacklist);
 	}
 	
 	public boolean isValid() {
-		try {
-			if (num == null && duration != null) {
-				throw new NullPointerException();
-			}
-			if (duration == null && num != null) {
-				throw new NullPointerException();
-			}
-		} catch (Exception e) {
-			return false;
-		}
-		return true;
+		return ((num == null && duration != null)|| (duration == null && num != null))? false : true;
 	}
 	
 	@Override