Merge 1806 code of vid-common

Change-Id: I75d52abed4a24dfe3827d79edc4a2938726aa87a
Issue-ID: VID-208
Signed-off-by: Sonsino, Ofir (os0695) <os0695@intl.att.com>

1 files changed, 3 insertions, 48 deletions

diff --git a/vid-app-common/src/main/java/org/onap/vid/model/CategoryParameter.java b/vid-app-common/src/main/java/org/onap/vid/model/CategoryParameter.java
index a98a71bc..99824e72 100644
--- a/vid-app-common/src/main/java/org/onap/vid/model/CategoryParameter.java
+++ b/vid-app-common/src/main/java/org/onap/vid/model/CategoryParameter.java
@@ -1,19 +1,16 @@
 package org.onap.vid.model;
 
 //import org.hibernate.annotations.Table;
-import org.onap.portalsdk.core.domain.support.DomainVo;
-import org.onap.vid.controllers.MaintenanceController;
 
-//import javax.persistence.*;
 import javax.persistence.*;
-import java.io.Serializable;
-import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
 
+//import javax.persistence.*;
+
 @Entity
 @Table(name = "vid_category_parameter", uniqueConstraints = @UniqueConstraint(columnNames = "name"))
-public class CategoryParameter extends DomainVo {
+public class CategoryParameter extends VidBaseEntity {
 
     public enum Family {
         PARAMETER_STANDARDIZATION,
@@ -45,30 +42,6 @@ public class CategoryParameter extends DomainVo {
         return super.getId();
     }
 
-    @Override
-    @Column(name = "CREATED_DATE")
-    public Date getCreated() {
-        return super.getCreated();
-    }
-
-    @Override
-    @Column(name = "MODIFIED_DATE")
-    public Date getModified() {
-        return super.getModified();
-    }
-
-    @Override
-    @Transient
-    public Long getCreatedId() {
-        return super.getCreatedId();
-    }
-
-    @Override
-    @Transient
-    public Long getModifiedId() {
-        return super.getModifiedId();
-    }
-
     @Column(name = "NAME", unique = true, nullable = false, length=50)
     public String getName() {
         return name;
@@ -78,24 +51,6 @@ public class CategoryParameter extends DomainVo {
         this.name = name;
     }
 
-    @Override
-    @Transient
-    public Serializable getAuditUserId() {
-        return super.getAuditUserId();
-    }
-
-    @Override
-    @Transient
-    public Long getRowNum() {
-        return super.getRowNum();
-    }
-
-    @Override
-    @Transient
-    public Set getAuditTrail() {
-        return super.getAuditTrail();
-    }
-
     @OneToMany(fetch = FetchType.EAGER, mappedBy = "categoryParameter")
     public Set<CategoryParameterOption> getOptions() {
         return options;