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=bc6ad99fdd5bdc07e90e55343a0863aad68cc727;hpb=5458362a7dd96b54916ea3a9a7d0a63a0122e4c2;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 bc6ad99fd..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,7 +21,6 @@ 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; @@ -109,7 +108,7 @@ public class PolicyVersion implements Serializable { } public PolicyVersion(){ - + // Empty constructor } @PrePersist @@ -122,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() { @@ -168,7 +159,7 @@ public class PolicyVersion implements Serializable { return modifiedDate; } - public void setModifiedDate(Timestamp modifiedDate) { + public void setModifiedDate(Date modifiedDate) { this.modifiedDate = modifiedDate; } @@ -200,16 +191,14 @@ public class PolicyVersion implements Serializable { PolicyVersion p = (PolicyVersion) obj; - return ( - id == p.id && + 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) - ); + modifiedBy.equals(p.modifiedBy); } }