X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ONAP-REST%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Frest%2Fjpa%2FPolicyVersion.java;h=663d34a17a7844c728347a737022261e2e4af82b;hb=401b48bc573561f097960a9ca7abe6d788456f28;hp=d098ee5a2ce49f2bc2ec4d4b4fd68ff781646fa0;hpb=073cc188efe9abb4c010cf674e34e2cf46ef1c52;p=policy%2Fengine.git

diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyVersion.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyVersion.java
index d098ee5a2..663d34a17 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyVersion.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyVersion.java
@@ -21,9 +21,9 @@
 package org.onap.policy.rest.jpa;
 
 import java.io.Serializable;
-//import java.sql.Clob;
 import java.sql.Timestamp;
 import java.util.Date;
+import java.util.Objects;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -108,7 +108,7 @@ public class PolicyVersion implements Serializable {
 	}
 	
 	public PolicyVersion(){
-		
+		// Empty constructor
 	}
 	
 	@PrePersist
@@ -121,14 +121,6 @@ public class PolicyVersion implements Serializable {
 	@PreUpdate
 	public void preUpdate() {
 		this.modifiedDate =  new Date();
-		/*
-		 * The modifiedBy must be set via the setModifiedBy() method since PolicyVersion
-		 * has been moved to XACML-REST module for access from the XACML-PAP-REST module
-		 
-		   String userid = ((XacmlAdminUI) UI.getCurrent()).getLoginUserId();
-		   this.modifiedBy =userid;
-		 * 
-		 */
 	}
 	
 	public int getId() {
@@ -167,7 +159,7 @@ public class PolicyVersion implements Serializable {
 		return modifiedDate;
 	}
 
-	public void setModifiedDate(Timestamp modifiedDate) {
+	public void setModifiedDate(Date modifiedDate) {
 		this.modifiedDate = modifiedDate;
 	}
 
@@ -178,6 +170,36 @@ public class PolicyVersion implements Serializable {
 	public void setModifiedBy(String modifiedBy) {
 		this.modifiedBy = modifiedBy;
 	}
+	
+	@Override
+	public int hashCode() {
+	return Objects.hash(id, policyName,	activeVersion, higherVersion, createdDate, 
+			createdBy, modifiedDate, modifiedBy);
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if(obj == null){
+			return false;
+		}
+		if(obj == this){
+			return true;
+		}
+		if(!(obj instanceof PolicyVersion)){
+			return false;
+		}
+
+		PolicyVersion p = (PolicyVersion) obj;
+		
+		return id == p.id &&
+				policyName.equals(p.policyName) &&
+				activeVersion == p.activeVersion &&
+				higherVersion == p.higherVersion &&
+				createdDate.equals(p.createdDate) &&
+				createdBy.equals(p.createdBy) &&
+				modifiedDate.equals(p.modifiedDate) &&
+				modifiedBy.equals(p.modifiedBy);
+	}
 
 }