JUnit/SONAR/Checkstyle in ONAP-REST

First batch of JPA pojos Lombok'd and some missing coverage updated

I'll be interested to see how Lomboking code shows up in SONAR, I have
not added much JUnit here but I have reduced a good bit of source code,
let's see what happens.

Issue-ID: POLICY-2131
Change-Id: I8f270ef57282f63821c1eb94dd6b50f8ae541028
Signed-off-by: liamfallon <liam.fallon@est.tech>

9 files changed, 402 insertions, 577 deletions

diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ActionBodyEntity.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ActionBodyEntity.java
index 16f6e7347..f47e474c6 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ActionBodyEntity.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ActionBodyEntity.java
@@ -3,6 +3,7 @@
  * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,12 +18,13 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
+
 package org.onap.policy.rest.jpa;
-/*
- */
+
+import com.fasterxml.jackson.annotation.JsonBackReference;
+
 import java.io.Serializable;
 import java.util.Date;
-import java.util.Objects;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -38,190 +40,80 @@ import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 import javax.persistence.Version;
+
+import lombok.Data;
+
 /*
  * The Entity class to persist a policy object Action Body
  */
-
-
-import com.fasterxml.jackson.annotation.JsonBackReference;
-
+// @formatter:off
 @Entity
-@Table(name="ActionBodyEntity")
-@NamedQueries({
-    @NamedQuery(name=" ActionBodyEntity.findAll", query="SELECT e FROM ActionBodyEntity e "),
-    @NamedQuery(name="ActionBodyEntity.deleteAll", query="DELETE FROM ActionBodyEntity WHERE 1=1")
-})
+@Table(name = "ActionBodyEntity")
+@NamedQueries(
+    {
+        @NamedQuery(name = " ActionBodyEntity.findAll", query = "SELECT e FROM ActionBodyEntity e "),
+        @NamedQuery(name = "ActionBodyEntity.deleteAll", query = "DELETE FROM ActionBodyEntity WHERE 1=1")
+    }
+)
+@Data
+//@foramtter:on
 
 public class ActionBodyEntity implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name="actionBodyId")
+    @Column(name = "actionBodyId")
     @JsonBackReference
     private long actionBodyId;
 
-    @Column(name="actionBodyName", nullable=false, length=255)
+    @Column(name = "actionBodyName", nullable = false, length = 255)
     private String actionBodyName = "";
 
     @Version
-    @Column(name="version")
+    @Column(name = "version")
     private int version;
 
     @Lob
-    @Column(name="actionBody", nullable=false, columnDefinition="TEXT")
+    @Column(name = "actionBody", nullable = false, columnDefinition = "TEXT")
     private String actionBody = "NoBody";
 
-    @Column(name="created_by", nullable=false, length=255)
+    @Column(name = "created_by", nullable = false, length = 255)
     private String createdBy = "guest";
 
     @Temporal(TemporalType.TIMESTAMP)
-    @Column(name="created_date", updatable=false)
+    @Column(name = "created_date", updatable = false)
     private Date createdDate;
 
-    @Column(name="modified_by", nullable=false, length=255)
+    @Column(name = "modified_by", nullable = false, length = 255)
     private String modifiedBy = "guest";
 
     @Temporal(TemporalType.TIMESTAMP)
-    @Column(name="modified_date", nullable=false)
+    @Column(name = "modified_date", nullable = false)
     private Date modifiedDate;
 
-    @Column(name="deleted", nullable=false)
+    @Column(name = "deleted", nullable = false)
     private boolean deleted = false;
 
     public ActionBodyEntity() {
-        //An empty constructor
+        // An empty constructor
     }
 
+    /**
+     * Called before an instance is persisted.
+     */
     @PrePersist
-    public void	prePersist() {
+    public void prePersist() {
         Date date = new Date();
         this.createdDate = date;
         this.modifiedDate = date;
     }
 
+    /**
+     * Called before an instance is updated.
+     */
     @PreUpdate
     public void preUpdate() {
         this.modifiedDate = new Date();
     }
-    /**
-     * @return the configurationDataId
-     */
-    public long getActionBodyId() {
-        return actionBodyId;
-    }
-    /**
-     * @param name the configuration body name to set
-     */
-    public void setActionBodyName(String name) {
-        this.actionBodyName = name;
-    }
-    public String getActionBodyName(){
-        return this.actionBodyName;
-    }
-
-    /**
-     * @return the actionBody
-     */
-    public String getActionBody() {
-        return actionBody;
-    }
-    /**
-     * @param body the configBody to set
-     */
-    public void setActionBody(String body) {
-        this.actionBody = body;
-    }
-    /**
-     * @return the createdBy
-     */
-    public String getCreatedBy() {
-        return createdBy;
-    }
-    /**
-     * @param createdBy the createdBy to set
-     */
-    public void setCreatedBy(String createdBy) {
-        this.createdBy = createdBy;
-    }
-
-    /**
-     * @return the modifiedBy
-     */
-    public String getModifiedBy() {
-        return modifiedBy;
-    }
-    /**
-     * @param modifiedBy the modifiedBy to set
-     */
-    public void setModifiedBy(String modifiedBy) {
-        this.modifiedBy = modifiedBy;
-    }
-    /**
-     * @return the modifiedDate
-     */
-    public Date getModifiedDate() {
-        return modifiedDate;
-    }
-    /**
-     * @param modifiedDate the modifiedDate to set
-     */
-    public void setModifiedDate(Date modifiedDate) {
-        this.modifiedDate = modifiedDate;
-    }
-    /**
-     * @return the version
-     */
-    public int getVersion() {
-        return version;
-    }
-    /**
-     * @return the createdDate
-     */
-    public Date getCreatedDate() {
-        return createdDate;
-    }
-
-    /**
-     * @return the deleted
-     */
-    public boolean isDeleted() {
-        return deleted;
-    }
-
-    /**
-     * @param deleted the deleted to set
-     */
-    public void setDeleted(boolean deleted) {
-        this.deleted = deleted;
-    }
-
-    @Override
-    public int hashCode() {
-    return Objects.hash(actionBodyId, actionBodyName, version, actionBody,
-            createdBy, createdDate, modifiedBy, modifiedDate, deleted);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if(obj == null){
-            return false;
-        }
-        if(obj == this){
-            return true;
-        }
-        if(!(obj instanceof ActionBodyEntity)){
-            return false;
-        }
-
-        return  actionBodyId == ((ActionBodyEntity) obj).actionBodyId &&
-                actionBodyName.equals(((ActionBodyEntity) obj).actionBodyName) &&
-                version == ((ActionBodyEntity) obj).version &&
-                actionBody.equals(((ActionBodyEntity) obj).actionBody) &&
-                createdBy.equals(((ActionBodyEntity) obj).createdBy) &&
-                createdDate.equals(((ActionBodyEntity) obj).createdDate) &&
-                modifiedBy.equals(((ActionBodyEntity) obj).modifiedBy) &&
-                modifiedDate.equals(((ActionBodyEntity) obj).modifiedDate) &&
-                deleted == ((ActionBodyEntity) obj).deleted;
-    }
 }
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ActionList.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ActionList.java
index d3e870bff..a0f4a301d 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ActionList.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ActionList.java
@@ -3,6 +3,7 @@
  * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,8 +20,7 @@
  */
 
 package org.onap.policy.rest.jpa;
-/*
- */
+
 import java.io.Serializable;
 
 import javax.persistence.Column;
@@ -32,47 +32,24 @@ import javax.persistence.NamedQuery;
 import javax.persistence.OrderBy;
 import javax.persistence.Table;
 
+import lombok.Data;
+
 @Entity
-@Table(name="actionlist")
-@NamedQuery(name="ActionList.findAll", query="SELECT e FROM ActionList e ")
+@Table(name = "actionlist")
+@NamedQuery(name = "ActionList.findAll", query = "SELECT e FROM ActionList e ")
+@Data
 public class ActionList implements Serializable {
     private static final long serialVersionUID = 1L;
 
-
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name="id")
+    @Column(name = "id")
     private int id;
 
-    @Column(name="actionname", nullable=false)
+    @Column(name = "actionname", nullable = false)
     @OrderBy("asc")
     private String actionName;
 
-    @Column(name="description")
+    @Column(name = "description")
     private String description;
-
-    public String getActionName() {
-        return this.actionName;
-    }
-
-    public void setActionName(String actionName) {
-        this.actionName = actionName;
-
-    }
-
-    public String getDescription() {
-        return this.description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-    public int getId() {
-        return this.id;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
 }
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ActionPolicyDict.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ActionPolicyDict.java
index e9a29446d..07e62f302 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ActionPolicyDict.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ActionPolicyDict.java
@@ -3,6 +3,7 @@
  * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,9 +19,8 @@
  * ============LICENSE_END=========================================================
  */
 
-/*
- */
 package org.onap.policy.rest.jpa;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -40,150 +40,83 @@ import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 
+import lombok.Data;
 
+// @formatter:off
 @Entity
-@Table(name="ActionPolicyDict")
-@NamedQueries({
-    @NamedQuery(name="ActionPolicyDict.findAll", query="SELECT e FROM ActionPolicyDict e")
-})
+@Table(name = "ActionPolicyDict")
+@NamedQueries(
+    {
+        @NamedQuery(name = "ActionPolicyDict.findAll", query = "SELECT e FROM ActionPolicyDict e")
+    }
+)
+@Data
+//@formatter:on
 public class ActionPolicyDict implements Serializable {
     private static final long serialVersionUID = 1L;
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name="id")
+    @Column(name = "id")
     private int id;
 
-    @Column(name="ATTRIBUTE_NAME", nullable=false)
+    @Column(name = "ATTRIBUTE_NAME", nullable = false)
     @OrderBy("asc")
     private String attributeName;
 
-    @Column(name="Type", nullable=false)
+    @Column(name = "Type", nullable = false)
     @OrderBy("asc")
     private String type;
 
-    @Column(name="URL", nullable=false)
+    @Column(name = "URL", nullable = false)
     @OrderBy("asc")
     private String url;
 
-    @Column(name="Method", nullable=false)
+    @Column(name = "Method", nullable = false)
     @OrderBy("asc")
     private String method;
 
-    @Column(name="Headers", nullable=true)
+    @Column(name = "Headers", nullable = true)
     @OrderBy("asc")
     private String header;
 
-    @Column(name="Body", nullable=true)
+    @Column(name = "Body", nullable = true)
     @OrderBy("asc")
     private String body;
 
     @Temporal(TemporalType.TIMESTAMP)
-    @Column(name="created_date", updatable=false)
+    @Column(name = "created_date", updatable = false)
     private Date createdDate;
 
-    @Column(name="description", nullable=true, length=2048)
+    @Column(name = "description", nullable = true, length = 2048)
     private String description;
 
     @Temporal(TemporalType.TIMESTAMP)
-    @Column(name="modified_date", nullable=false)
+    @Column(name = "modified_date", nullable = false)
     private Date modifiedDate;
 
     @ManyToOne(optional = false)
-    @JoinColumn(name="created_by")
+    @JoinColumn(name = "created_by")
     private UserInfo userCreatedBy;
 
     @ManyToOne(optional = false)
-    @JoinColumn(name="modified_by")
+    @JoinColumn(name = "modified_by")
     private UserInfo userModifiedBy;
 
-    public UserInfo getUserCreatedBy() {
-        return userCreatedBy;
-    }
-
-    public void setUserCreatedBy(UserInfo userCreatedBy) {
-        this.userCreatedBy = userCreatedBy;
-    }
-
-    public UserInfo getUserModifiedBy() {
-        return userModifiedBy;
-    }
-
-    public void setUserModifiedBy(UserInfo userModifiedBy) {
-        this.userModifiedBy = userModifiedBy;
-    }
-
+    /**
+     * Called before an instance is persisted.
+     */
     @PrePersist
-    public void	prePersist() {
+    public void prePersist() {
         Date date = new Date();
         this.createdDate = date;
         this.modifiedDate = date;
     }
+
+    /**
+     * Called before an instance is updated.
+     */
     @PreUpdate
     public void preUpdate() {
         this.modifiedDate = new Date();
     }
-    public int getId() {
-        return this.id;
-    }
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    public Date getCreatedDate() {
-        return this.createdDate;
-    }
-    public void setCreatedDate(Date createdDate) {
-        this.createdDate = createdDate;
-    }
-    public String getDescription() {
-        return this.description;
-    }
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public Date getModifiedDate() {
-        return this.modifiedDate;
-    }
-    public void setModifiedDate(Date modifiedDate) {
-        this.modifiedDate = modifiedDate;
-    }
-    public String getType() {
-        return type;
-    }
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getUrl() {
-        return url;
-    }
-    public void setUrl(String url) {
-        this.url = url;
-    }
-    public String getMethod() {
-        return method;
-    }
-    public void setMethod(String method) {
-        this.method = method;
-    }
-    public String getHeader() {
-        return header;
-    }
-    public void setHeader(String header) {
-        this.header = header;
-    }
-
-    public String getBody() {
-        return body;
-    }
-    public void setBody(String body) {
-        this.body = body;
-    }
-    public String getAttributeName() {
-        return attributeName;
-    }
-    public void setAttributeName(String attributeName) {
-        this.attributeName = attributeName;
-    }
 }
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/AddressGroup.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/AddressGroup.java
index c71969a8b..efefad2d2 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/AddressGroup.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/AddressGroup.java
@@ -3,13 +3,14 @@
  * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,8 +20,7 @@
  */
 
 package org.onap.policy.rest.jpa;
-/*
- */
+
 import java.io.Serializable;
 
 import javax.persistence.Column;
@@ -32,59 +32,61 @@ import javax.persistence.NamedQuery;
 import javax.persistence.OrderBy;
 import javax.persistence.Table;
 
+import lombok.Data;
+
+/**
+ * The Class AddressGroup is a JPA class for address groups.
+ */
 @Entity
-@Table(name="AddressGroup")
-@NamedQuery(name="AddressGroup.findAll", query="SELECT e FROM AddressGroup e ")
+@Table(name = "AddressGroup")
+@NamedQuery(name = "AddressGroup.findAll", query = "SELECT e FROM AddressGroup e ")
+
+/**
+ * Instantiates a new address group.
+ */
+@Data
 public class AddressGroup implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name="id")
+    @Column(name = "id")
     private int id;
 
-    @Column(name="name", nullable=false)
+    @Column(name = "name", nullable = false)
     @OrderBy("asc")
     private String name;
 
-    @Column(name="prefixlist")
+    @Column(name = "prefixlist")
     private String prefixList;
 
-
-    @Column(name="description")
+    @Column(name = "description")
     private String description;
 
-    public int getId() {
-        return this.id;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
+    /**
+     * Get the group name.
+     *
+     * @return the group name
+     */
     public String getGroupName() {
-        return this.name;
+        return name;
     }
 
-    public void setGroupName(String serviceName) {
-        this.name = serviceName;
-
-    }
-
-    public String getPrefixList() {
-        return this.prefixList;
+    /**
+     * Set the group name.
+     *
+     * @param groupName the group name
+     */
+    public void setGroupName(final String groupName) {
+        this.name = groupName;
     }
 
+    /**
+     * Sets the service list.
+     *
+     * @param prefixList the new service list
+     */
     public void setServiceList(String prefixList) {
         this.prefixList = prefixList;
-
-    }
-    public String getDescription() {
-        return this.description;
     }
-
-    public void setDescription(String description) {
-        this.description = description;
-
-    }
-
 }
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/Attribute.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/Attribute.java
index 3389d391e..a084f2c85 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/Attribute.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/Attribute.java
@@ -3,6 +3,7 @@
  * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +21,8 @@
 
 package org.onap.policy.rest.jpa;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import java.io.Serializable;
 import java.util.Date;
 import java.util.HashSet;
@@ -43,77 +46,90 @@ import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 import javax.persistence.Transient;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
  * The persistent class for the Attribute database table.
  * 
  */
 @Entity
-@Table(name="Attribute")
-@NamedQuery(name="Attribute.findAll", query="SELECT a FROM Attribute a order by  a.priority asc, a.xacmlId asc")
+@Table(name = "Attribute")
+@NamedQuery(name = "Attribute.findAll", query = "SELECT a FROM Attribute a order by  a.priority asc, a.xacmlId asc")
+
+/**
+ * Gets the user modified by.
+ *
+ * @return the user modified by
+ */
+@Getter
+
+/**
+ * Sets the user modified by.
+ *
+ * @param userModifiedBy the new user modified by
+ */
+@Setter
 public class Attribute implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name="id")
+    @Column(name = "id")
     private int id;
 
-    //bi-directional many-to-one association to Category
+    // bi-directional many-to-one association to Category
     @ManyToOne
-    @JoinColumn(name="constraint_type", nullable=true)
+    @JoinColumn(name = "constraint_type", nullable = true)
     @JsonIgnore
     private ConstraintType constraintType;
 
     @Temporal(TemporalType.TIMESTAMP)
-    @Column(name="created_date", updatable=false)
+    @Column(name = "created_date", updatable = false)
     private Date createdDate;
 
-    @Column(name="description", nullable=true, length=2048)
+    @Column(name = "description", nullable = true, length = 2048)
     private String description;
 
     @Temporal(TemporalType.TIMESTAMP)
-    @Column(name="modified_date", nullable=false)
+    @Column(name = "modified_date", nullable = false)
     private Date modifiedDate;
 
-    @Column(name="PRIORITY", nullable=true)
+    @Column(name = "PRIORITY", nullable = true)
     @OrderBy("asc")
     private String priority;
 
-    @Column(name="ATTRIBUTE_VALUE", nullable=true)
+    @Column(name = "ATTRIBUTE_VALUE", nullable = true)
     @OrderBy("asc")
     private String attributeValue;
 
-    @Column(name="xacml_id",  unique = true, nullable=false)
+    @Column(name = "xacml_id", unique = true, nullable = false)
     @OrderBy("asc")
     private String xacmlId = "urn";
 
-    //bi-directional many-to-one association to ConstraintValue
-    @OneToMany(mappedBy="attribute", orphanRemoval=true, cascade=CascadeType.REMOVE)
+    // bi-directional many-to-one association to ConstraintValue
+    @OneToMany(mappedBy = "attribute", orphanRemoval = true, cascade = CascadeType.REMOVE)
     @JsonIgnore
     private Set<ConstraintValue> constraintValues = new HashSet<>();
 
-    //bi-directional many-to-one association to Category
+    // bi-directional many-to-one association to Category
     @ManyToOne
-    @JoinColumn(name="category")
+    @JoinColumn(name = "category")
     @JsonIgnore
     private Category categoryBean;
 
-    //bi-directional many-to-one association to Datatype
+    // bi-directional many-to-one association to Datatype
     @ManyToOne
-    @JoinColumn(name="datatype")
+    @JoinColumn(name = "datatype")
     private Datatype datatypeBean;
 
-    @Column(name="is_designator", nullable=false)
+    @Column(name = "is_designator", nullable = false)
     @JsonIgnore
     private char isDesignator = '1';
 
-    @Column(name="selector_path", nullable=true, length=2048)
+    @Column(name = "selector_path", nullable = true, length = 2048)
     private String selectorPath;
 
-
-
     @Transient
     private String issuer = null;
 
@@ -121,38 +137,34 @@ public class Attribute implements Serializable {
     private boolean mustBePresent = false;
 
     @ManyToOne(optional = false)
-    @JoinColumn(name="created_by")
+    @JoinColumn(name = "created_by")
     private UserInfo userCreatedBy;
 
     @ManyToOne(optional = false)
-    @JoinColumn(name="modified_by")
+    @JoinColumn(name = "modified_by")
     private UserInfo userModifiedBy;
 
-    public UserInfo getUserCreatedBy() {
-        return userCreatedBy;
-    }
-
-    public void setUserCreatedBy(UserInfo userCreatedBy) {
-        this.userCreatedBy = userCreatedBy;
-    }
-
-    public UserInfo getUserModifiedBy() {
-        return userModifiedBy;
-    }
-
-    public void setUserModifiedBy(UserInfo userModifiedBy) {
-        this.userModifiedBy = userModifiedBy;
-    }
-
-
+    /**
+     * Default constructor.
+     */
     public Attribute() {
-        //An empty constructor
+        // An empty constructor
     }
 
+    /**
+     * Constructor with domain.
+     * 
+     * @param domain the domain to use to construct the object
+     */
     public Attribute(String domain) {
         this.xacmlId = domain;
     }
 
+    /**
+     * Copy constructor.
+     * 
+     * @param copy the copy to copy from
+     */
     public Attribute(Attribute copy) {
         this(copy.getXacmlId() + ":(0)");
         this.constraintType = copy.getConstraintType();
@@ -166,78 +178,45 @@ public class Attribute implements Serializable {
         }
     }
 
+    /**
+     * Called before an instance is persisted.
+     */
     @PrePersist
-    public void	prePersist() {
+    public void prePersist() {
         Date date = new Date();
         this.createdDate = date;
         this.modifiedDate = date;
     }
 
+    /**
+     * Called before an instance is updated.
+     */
     @PreUpdate
     public void preUpdate() {
         this.modifiedDate = new Date();
     }
 
-    public int getId() {
-        return this.id;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    public ConstraintType getConstraintType() {
-        return this.constraintType;
-    }
-
-    public void setConstraintType(ConstraintType constraintType) {
-        this.constraintType = constraintType;
-    }
-
-    public Date getCreatedDate() {
-        return this.createdDate;
-    }
-
-    public void setCreatedDate(Date createdDate) {
-        this.createdDate = createdDate;
-    }
-
-    public String getDescription() {
-        return this.description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public Date getModifiedDate() {
-        return this.modifiedDate;
-    }
-
-    public void setModifiedDate(Date modifiedDate) {
-        this.modifiedDate = modifiedDate;
-    }
-
-    public String getXacmlId() {
-        return this.xacmlId;
-    }
-
-
-    public void setXacmlId(String xacmlId) {
-        this.xacmlId = xacmlId;
-    }
-
-    public Set<ConstraintValue> getConstraintValues() {
-        return this.constraintValues;
-    }
-
+    /**
+     * Sets the constraint values.
+     *
+     * @param constraintValues the new constraint values
+     */
     public void setConstraintValues(Set<ConstraintValue> constraintValues) {
+        if (this.constraintValues == null) {
+            this.constraintValues = new HashSet<>();
+        }
         for (ConstraintValue value : this.constraintValues) {
             value.setAttribute(this);
         }
         this.constraintValues = constraintValues;
     }
 
+    /**
+     * Adds the constraint value.
+     *
+     * @param constraintValue the constraint value
+     * @return the constraint value
+     */
     public ConstraintValue addConstraintValue(ConstraintValue constraintValue) {
         if (this.constraintValues == null) {
             this.constraintValues = new HashSet<>();
@@ -248,6 +227,12 @@ public class Attribute implements Serializable {
         return constraintValue;
     }
 
+    /**
+     * Removes the constraint value.
+     *
+     * @param constraintValue the constraint value
+     * @return the constraint value
+     */
     public ConstraintValue removeConstraintValue(ConstraintValue constraintValue) {
         this.constraintValues.remove(constraintValue);
         constraintValue.setAttribute(null);
@@ -255,6 +240,9 @@ public class Attribute implements Serializable {
         return constraintValue;
     }
 
+    /**
+     * Removes the all constraint values.
+     */
     public void removeAllConstraintValues() {
         if (this.constraintValues == null) {
             return;
@@ -265,63 +253,61 @@ public class Attribute implements Serializable {
         this.constraintValues.clear();
     }
 
-    public Category getCategoryBean() {
-        return this.categoryBean;
-    }
-
-    public void setCategoryBean(Category categoryBean) {
-        this.categoryBean = categoryBean;
-    }
-
-    public Datatype getDatatypeBean() {
-        return this.datatypeBean;
-    }
-
-    public void setDatatypeBean(Datatype datatypeBean) {
-        this.datatypeBean = datatypeBean;
-    }
-
-    public char getIsDesignator() {
-        return this.isDesignator;
-    }
-
-    public void setIsDesignator(char is) {
-        this.isDesignator = is;
-    }
-
-    public String getSelectorPath() {
-        return this.selectorPath;
-    }
-
-    public void setSelectorPath(String path) {
-        this.selectorPath = path;
-    }
-
+    /**
+     * Gets the issuer.
+     *
+     * @return the issuer
+     */
     @Transient
     public String getIssuer() {
         return issuer;
     }
 
+    /**
+     * Sets the issuer.
+     *
+     * @param issuer the new issuer
+     */
     @Transient
     public void setIssuer(String issuer) {
         this.issuer = issuer;
     }
 
+    /**
+     * Checks if is must be present.
+     *
+     * @return true, if is must be present
+     */
     @Transient
     public boolean isMustBePresent() {
         return mustBePresent;
     }
 
+    /**
+     * Sets the must be present.
+     *
+     * @param mustBePresent the new must be present
+     */
     @Transient
     public void setMustBePresent(boolean mustBePresent) {
         this.mustBePresent = mustBePresent;
     }
 
+    /**
+     * Checks if is designator.
+     *
+     * @return true, if is designator
+     */
     @Transient
     public boolean isDesignator() {
         return this.isDesignator == '1';
     }
 
+    /**
+     * Sets the checks if is designator.
+     *
+     * @param is the new checks if is designator
+     */
     @Transient
     public void setIsDesignator(boolean is) {
         if (is) {
@@ -330,21 +316,4 @@ public class Attribute implements Serializable {
             this.isDesignator = '0';
         }
     }
-
-    public String getPriority() {
-        return priority;
-    }
-
-    public void setPriority(String priority) {
-        this.priority = priority;
-    }
-
-    public String getAttributeValue() {
-        return attributeValue;
-    }
-
-    public void setAttributeValue(String attributeValue) {
-        this.attributeValue = attributeValue;
-    }
 }
-
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/AttributeAssignment.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/AttributeAssignment.java
index d05b2d4af..5fb7c9c2c 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/AttributeAssignment.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/AttributeAssignment.java
@@ -3,6 +3,7 @@
  * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +18,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
+
 package org.onap.policy.rest.jpa;
 
 import java.io.Serializable;
@@ -30,14 +32,16 @@ import javax.persistence.ManyToOne;
 import javax.persistence.NamedQuery;
 import javax.persistence.Table;
 
+import lombok.Data;
 
 /**
  * The persistent class for the ObadviceExpressions database table.
  * 
  */
 @Entity
-@Table(name="AttributeAssignment")
-@NamedQuery(name="AttributeAssignment.findAll", query="SELECT a FROM AttributeAssignment a")
+@Table(name = "AttributeAssignment")
+@NamedQuery(name = "AttributeAssignment.findAll", query = "SELECT a FROM AttributeAssignment a")
+@Data
 public class AttributeAssignment implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -50,45 +54,21 @@ public class AttributeAssignment implements Serializable {
 
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name="id")
+    @Column(name = "id")
     private int id;
 
-    @Column(name="attribute_id")
+    @Column(name = "attribute_id")
     private int attributeId;
 
-    //bi-directional many-to-one association to Obadvice
-    @Column(name="expression", nullable=false)
+    // bi-directional many-to-one association to Obadvice
+    @Column(name = "expression", nullable = false)
     private String expression;
 
-    //bi-directional many-to-one association to Obadvice
+    // bi-directional many-to-one association to Obadvice
     @ManyToOne
     private Obadvice obadvice;
 
     public AttributeAssignment() {
-        //An empty constructor
-    }
-
-    public int getId() {
-        return this.id;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    public int getAttributeId() {
-        return this.attributeId;
-    }
-
-    public void setAttributeId(int attributeId) {
-        this.attributeId = attributeId;
-    }
-
-    public String getExpression() {
-        return expression;
-    }
-
-    public void setExpression(String expression) {
-        this.expression = expression;
+        // An empty constructor
     }
 }
diff --git a/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/ActionBodyEntityTest.java b/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/ActionBodyEntityTest.java
index f8777d868..ab74d07f8 100644
--- a/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/ActionBodyEntityTest.java
+++ b/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/ActionBodyEntityTest.java
@@ -3,6 +3,7 @@
  * ONAP-REST
  * ================================================================================
  * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,43 +26,46 @@ import static org.hamcrest.CoreMatchers.not;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertThat;
+
 import java.util.Date;
+
 import org.junit.Test;
 
 public class ActionBodyEntityTest {
-  @Test
-  public void testEntity() {
-    // Set up test data
-    String value = "testVal";
-    Date date = new Date();
-    ActionBodyEntity entity = new ActionBodyEntity();
-    entity.prePersist();
-    ActionBodyEntity entity2 = new ActionBodyEntity();
-    ActionBodyEntity entity3 = new ActionBodyEntity();
+    @Test
+    public void testEntity() {
+        // Set up test data
+        String value = "testVal";
+        ActionBodyEntity entity = new ActionBodyEntity();
+        entity.prePersist();
+
+        // Test set and get
+        ActionBodyEntity entity0 = new ActionBodyEntity();
+        entity0.preUpdate();
+        entity0.setActionBody(value);
+        assertEquals(value, entity0.getActionBody());
+        entity0.setActionBodyName(value);
+        assertEquals(value, entity0.getActionBodyName());
+        entity0.setCreatedBy(value);
+        assertEquals(value, entity0.getCreatedBy());
+        entity0.setModifiedBy(value);
+        assertEquals(value, entity0.getModifiedBy());
 
-    // Test set and get
-    entity3.preUpdate();
-    entity3.setActionBody(value);
-    assertEquals(value, entity3.getActionBody());
-    entity3.setActionBodyName(value);
-    assertEquals(value, entity3.getActionBodyName());
-    entity3.setCreatedBy(value);
-    assertEquals(value, entity3.getCreatedBy());
-    entity3.setModifiedBy(value);
-    assertEquals(value, entity3.getModifiedBy());
-    entity3.setModifiedDate(date);
-    assertEquals(date, entity3.getModifiedDate());
-    assertEquals(0, entity3.getVersion());
-    assertNull(entity3.getCreatedDate());
-    entity3.setDeleted(true);
-    assertEquals(true, entity3.isDeleted());
-    assertEquals(0, entity3.getActionBodyId());
+        Date date = new Date();
+        entity0.setModifiedDate(date);
+        assertEquals(date, entity0.getModifiedDate());
+        assertEquals(0, entity0.getVersion());
+        assertNull(entity0.getCreatedDate());
+        entity0.setDeleted(true);
+        assertEquals(true, entity0.isDeleted());
+        assertEquals(0, entity0.getActionBodyId());
 
-    // Test equals method combinations
-    assertEquals(false, entity.equals(null));
-    assertEquals(true, entity.equals(entity));
-    assertEquals(false, entity.equals(value));
-    assertEquals(false, entity.equals(entity2));
-    assertThat(entity.hashCode(), is(not(0)));
-  }
+        // Test equals method combinations
+        assertEquals(false, entity.equals(null));
+        assertEquals(true, entity.equals(entity));
+        assertEquals(false, entity.equals((Object) value));
+        ActionBodyEntity entity1 = new ActionBodyEntity();
+        assertEquals(false, entity.equals(entity1));
+        assertThat(entity.hashCode(), is(not(0)));
+    }
 }
diff --git a/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/ActionDictionaryJPATest.java b/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/ActionDictionaryJpaTest.java
index 580b3e35d..b2c3a77c1 100644
--- a/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/ActionDictionaryJPATest.java
+++ b/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/ActionDictionaryJpaTest.java
@@ -3,6 +3,7 @@
  * ONAP-REST
  * ================================================================================
  * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +18,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
+
 package org.onap.policy.rest.jpa;
 
 import static org.junit.Assert.assertTrue;
@@ -30,11 +32,16 @@ import org.junit.Test;
 import org.onap.policy.common.logging.flexlogger.FlexLogger;
 import org.onap.policy.common.logging.flexlogger.Logger;
 
-public class ActionDictionaryJPATest {
+public class ActionDictionaryJpaTest {
 
-    private static Logger logger = FlexLogger.getLogger(ActionDictionaryJPATest.class);
+    private static Logger logger = FlexLogger.getLogger(ActionDictionaryJpaTest.class);
     private UserInfo userInfo;
 
+    /**
+     * Set up the test.
+     * 
+     * @throws Exception on test errors
+     */
     @Before
     public void setUp() throws Exception {
         logger.info("setUp: Entering");
@@ -45,7 +52,7 @@ public class ActionDictionaryJPATest {
     }
 
     @Test
-    public void testActionDictionary(){
+    public void testActionDictionary() {
         ActionPolicyDict data = new ActionPolicyDict();
         data.setId(1);
         assertTrue(1 == data.getId());
@@ -66,24 +73,24 @@ public class ActionDictionaryJPATest {
         data.prePersist();
         data.preUpdate();
         data.setCreatedDate(new Date());
-        assertTrue(data.getCreatedDate()!=null);
+        assertTrue(data.getCreatedDate() != null);
         data.setModifiedDate(new Date());
-        assertTrue(data.getModifiedDate()!=null);
+        assertTrue(data.getModifiedDate() != null);
         data.setUserCreatedBy(userInfo);
-        assertTrue(data.getUserCreatedBy()!=null);
+        assertTrue(data.getUserCreatedBy() != null);
         data.setUserModifiedBy(userInfo);
-        assertTrue(data.getUserModifiedBy()!=null);
+        assertTrue(data.getUserModifiedBy() != null);
     }
 
     @Test
-    public void testFunctionArgument(){
+    public void testFunctionArgument() {
         FunctionArgument data = new FunctionArgument();
         data.setArgIndex(1);
         assertTrue(1 == data.getArgIndex());
         data.setDatatypeBean(new Datatype());
-        assertTrue(data.getDatatypeBean()!=null);
+        assertTrue(data.getDatatypeBean() != null);
         data.setFunctionDefinition(new FunctionDefinition());
-        assertTrue(data.getFunctionDefinition()!=null);
+        assertTrue(data.getFunctionDefinition() != null);
         data.setId(1);
         assertTrue(1 == data.getId());
         data.isBag();
@@ -94,16 +101,16 @@ public class ActionDictionaryJPATest {
     }
 
     @Test
-    public void testFunctionDefinition(){
+    public void testFunctionDefinition() {
         FunctionDefinition data = new FunctionDefinition();
         data.setArgLb(1);
         assertTrue(1 == data.getArgLb());
         data.setArgUb(1);
         assertTrue(1 == data.getArgUb());
         data.setDatatypeBean(new Datatype());
-        assertTrue(data.getDatatypeBean()!=null);
+        assertTrue(data.getDatatypeBean() != null);
         data.setFunctionArguments(new ArrayList<>());
-        assertTrue(data.getFunctionArguments()!=null);
+        assertTrue(data.getFunctionArguments() != null);
         data.setHigherOrderArg_LB(1);
         assertTrue(1 == data.getHigherOrderArg_LB());
         data.setHigherOrderArg_UB(1);
@@ -126,7 +133,7 @@ public class ActionDictionaryJPATest {
     }
 
     @Test
-    public void testCategory(){
+    public void testCategory() {
         Category data = new Category();
         new Category(null);
         data.setAttributes(new HashSet<>());
@@ -137,7 +144,7 @@ public class ActionDictionaryJPATest {
         Category.extractGrouping("urn:oasis:names:tc:xacml:1.0:subject-category:intermediary-subject");
         data.getIdentifer();
         data.toString();
-        assertTrue(data.getAttributes()!=null);
+        assertTrue(data.getAttributes() != null);
         data.setGrouping("Test");
         assertTrue("Test".equals(data.getGrouping()));
         data.setId(1);
@@ -149,12 +156,12 @@ public class ActionDictionaryJPATest {
     }
 
     @Test
-    public void testConstraintType(){
+    public void testConstraintType() {
         ConstraintType data = new ConstraintType();
         new ConstraintType("Test", "Test");
         ConstraintType.getRangeTypes();
         data.setAttributes(new HashSet<>());
-        assertTrue(data.getAttributes()!=null);
+        assertTrue(data.getAttributes() != null);
         data.setConstraintType("Test");
         assertTrue("Test".equals(data.getConstraintType()));
         data.setDescription("Test");
@@ -164,13 +171,13 @@ public class ActionDictionaryJPATest {
     }
 
     @Test
-    public void testConstraintValue(){
+    public void testConstraintValue() {
         ConstraintValue data = new ConstraintValue();
         data.clone();
         new ConstraintValue(new ConstraintValue());
-        new ConstraintValue("Test","Test");
+        new ConstraintValue("Test", "Test");
         data.setAttribute(new Attribute());
-        assertTrue(data.getAttribute()!=null);
+        assertTrue(data.getAttribute() != null);
         data.setId(1);
         assertTrue(1 == data.getId());
         data.setProperty("Test");
@@ -180,7 +187,7 @@ public class ActionDictionaryJPATest {
     }
 
     @Test
-    public void testObadvice(){
+    public void testObadvice() {
         Obadvice data = new Obadvice();
         new Obadvice();
         new Obadvice("Test", "Test");
@@ -201,7 +208,7 @@ public class ActionDictionaryJPATest {
         data.setModifiedBy("Test");
         assertTrue("Test".equals(data.getModifiedBy()));
         data.setObadviceExpressions(new HashSet<>());
-        assertTrue(data.getObadviceExpressions()!=null);
+        assertTrue(data.getObadviceExpressions() != null);
         data.setType("Test");
         assertTrue("Test".equals(data.getType()));
         data.setXacmlId("Test");
@@ -209,21 +216,21 @@ public class ActionDictionaryJPATest {
     }
 
     @Test
-    public void testObadviceExpression(){
+    public void testObadviceExpression() {
         ObadviceExpression data = new ObadviceExpression();
         data.clone();
         data.setAttribute(new Attribute());
-        assertTrue(data.getAttribute()!=null);
+        assertTrue(data.getAttribute() != null);
         data.setId(1);
         assertTrue(1 == data.getId());
         data.setObadvice(new Obadvice());
-        assertTrue(data.getObadvice()!=null);
+        assertTrue(data.getObadvice() != null);
         data.setType("Test");
         assertTrue("Test".equals(data.getType()));
     }
 
     @Test
-    public void testRuleAlgorithms(){
+    public void testRuleAlgorithms() {
         RuleAlgorithms data = new RuleAlgorithms();
         data.isCustom();
         data.isStandard();
@@ -237,7 +244,7 @@ public class ActionDictionaryJPATest {
     }
 
     @Test
-    public void testAttributeAssignment(){
+    public void testAttributeAssignment() {
         AttributeAssignment data = new AttributeAssignment();
         data.setId(1);
         assertTrue(1 == data.getId());
@@ -248,16 +255,16 @@ public class ActionDictionaryJPATest {
     }
 
     @Test
-    public void testDatatype(){
+    public void testDatatype() {
         Datatype data = new Datatype();
         new Datatype(null);
         new Datatype(1, new Datatype());
         data.setArguments(new HashSet<>());
-        assertTrue(data.getArguments()!=null);
+        assertTrue(data.getArguments() != null);
         data.setAttributes(new HashSet<>());
-        assertTrue(data.getAttributes()!=null);
+        assertTrue(data.getAttributes() != null);
         data.setFunctions(new HashSet<>());
-        assertTrue(data.getFunctions()!=null);
+        assertTrue(data.getFunctions() != null);
         data.setId(1);
         assertTrue(1 == data.getId());
         data.setShortName("Test");
@@ -270,8 +277,8 @@ public class ActionDictionaryJPATest {
         data.removeArgument(new FunctionArgument());
         data.removeAttribute(new Attribute());
         data.removeAttribute(new FunctionDefinition());
-        assertTrue(data.getIdentifer()!=null);
-        assertTrue(data.getIdentiferByShortName()!=null);
+        assertTrue(data.getIdentifer() != null);
+        assertTrue(data.getIdentiferByShortName() != null);
         data.setIsStandard(Datatype.STANDARD);
         assertTrue(data.isStandard());
         data.setIsStandard(Datatype.CUSTOM);
@@ -279,7 +286,7 @@ public class ActionDictionaryJPATest {
     }
 
     @Test
-    public void testPolicyAlgorithms(){
+    public void testPolicyAlgorithms() {
         PolicyAlgorithms data = new PolicyAlgorithms();
         data.setId(1);
         assertTrue(1 == data.getId());
diff --git a/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/CommonDictionaryJPATest.java b/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/CommonDictionaryJpaTest.java
index 230844a64..fa83017f2 100644
--- a/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/CommonDictionaryJPATest.java
+++ b/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/CommonDictionaryJpaTest.java
@@ -3,6 +3,7 @@
  * ONAP-REST
  * ================================================================================
  * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,23 +18,34 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
+
 package org.onap.policy.rest.jpa;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Date;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.Set;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.onap.policy.common.logging.flexlogger.FlexLogger;
 import org.onap.policy.common.logging.flexlogger.Logger;
 
-public class CommonDictionaryJPATest {
+public class CommonDictionaryJpaTest {
 
-    private static Logger logger = FlexLogger.getLogger(CommonDictionaryJPATest.class);
+    private static Logger logger = FlexLogger.getLogger(CommonDictionaryJpaTest.class);
     private UserInfo userInfo;
 
+    /**
+     * Initiations for testing.
+     * 
+     * @throws Exception on test initiation errors
+     */
     @Before
     public void setUp() throws Exception {
         logger.info("setUp: Entering");
@@ -44,16 +56,16 @@ public class CommonDictionaryJPATest {
     }
 
     @Test
-    public void testAttribute(){
+    public void testAttribute() {
         Attribute data = new Attribute();
         data.setId(1);
         assertTrue(1 == data.getId());
         data.setCategoryBean(new Category());
-        assertTrue(data.getCategoryBean()!=null);
+        assertTrue(data.getCategoryBean() != null);
         data.setConstraintType(new ConstraintType());
-        assertTrue(data.getConstraintType()!=null);
+        assertTrue(data.getConstraintType() != null);
         data.setConstraintValues(new HashSet<>());
-        assertTrue(data.getConstraintValues()!=null);
+        assertTrue(data.getConstraintValues() != null);
         data.addConstraintValue(new ConstraintValue());
         data.removeConstraintValue(new ConstraintValue());
         data.removeAllConstraintValues();
@@ -68,7 +80,7 @@ public class CommonDictionaryJPATest {
         data.setXacmlId("Test");
         assertTrue("Test".equals(data.getXacmlId()));
         data.setDatatypeBean(new Datatype());
-        assertTrue(data.getDatatypeBean()!=null);
+        assertTrue(data.getDatatypeBean() != null);
         data.setIsDesignator(true);
         assertTrue(data.isDesignator());
         data.setIssuer("Test");
@@ -80,17 +92,66 @@ public class CommonDictionaryJPATest {
         data.setSelectorPath("Test");
         assertTrue("Test".equals(data.getSelectorPath()));
         data.setCreatedDate(new Date());
-        assertTrue(data.getCreatedDate()!=null);
+        assertTrue(data.getCreatedDate() != null);
         data.setModifiedDate(new Date());
-        assertTrue(data.getModifiedDate()!=null);
+        assertTrue(data.getModifiedDate() != null);
         data.setUserCreatedBy(userInfo);
-        assertTrue(data.getUserCreatedBy()!=null);
+        assertTrue(data.getUserCreatedBy() != null);
         data.setUserModifiedBy(userInfo);
-        assertTrue(data.getUserModifiedBy()!=null);
+        assertTrue(data.getUserModifiedBy() != null);
+
+        ConstraintValue constraintValue = new ConstraintValue("Greeting", "Hello");
+        data.getConstraintValues().add(constraintValue);
+        assertEquals("Hello", data.getConstraintValues().iterator().next().getValue());
+
+        data.removeConstraintValue(constraintValue);
+        assertTrue(data.getConstraintValues().isEmpty());
+
+        data.addConstraintValue(constraintValue);
+        assertEquals("Hello", data.getConstraintValues().iterator().next().getValue());
+
+        data.setConstraintValues(null);
+        assertNull(data.getConstraintValues());
+
+        data.addConstraintValue(constraintValue);
+        assertEquals("Hello", data.getConstraintValues().iterator().next().getValue());
+
+        data.removeAllConstraintValues();
+        assertTrue(data.getConstraintValues().isEmpty());
+
+        data.setConstraintValues(null);
+        assertNull(data.getConstraintValues());
+
+        data.removeAllConstraintValues();
+        assertNull(data.getConstraintValues());
+
+        data.addConstraintValue(constraintValue);
+        assertEquals("Hello", data.getConstraintValues().iterator().next().getValue());
+
+        data.setConstraintValues(null);
+        assertNull(data.getConstraintValues());
+
+        Set<ConstraintValue> constraintValueSet = new LinkedHashSet<>();
+        constraintValueSet.add(constraintValue);
+
+        data.setConstraintValues(null);
+        assertNull(data.getConstraintValues());
+
+        data.setConstraintValues(constraintValueSet);
+        assertEquals("Hello", data.getConstraintValues().iterator().next().getValue());
+
+        Attribute data2 = new Attribute(data);
+        assertEquals("Hello", data2.getConstraintValues().iterator().next().getValue());
+
+        data.setIsDesignator(true);
+        assertTrue(data.isDesignator());
+
+        data.setIsDesignator(false);
+        assertFalse(data.isDesignator());
     }
 
     @Test
-    public void testOnapName(){
+    public void testOnapName() {
         OnapName data = new OnapName();
         data.preUpdate();
         data.prePersist();
@@ -101,17 +162,17 @@ public class CommonDictionaryJPATest {
         data.setDescription("Test");
         assertTrue("Test".equals(data.getDescription()));
         data.setCreatedDate(new Date());
-        assertTrue(data.getCreatedDate()!=null);
+        assertTrue(data.getCreatedDate() != null);
         data.setModifiedDate(new Date());
-        assertTrue(data.getModifiedDate()!=null);
+        assertTrue(data.getModifiedDate() != null);
         data.setUserCreatedBy(userInfo);
-        assertTrue(data.getUserCreatedBy()!=null);
+        assertTrue(data.getUserCreatedBy() != null);
         data.setUserModifiedBy(userInfo);
-        assertTrue(data.getUserModifiedBy()!=null);
+        assertTrue(data.getUserModifiedBy() != null);
     }
 
     @Test
-    public void testRiskType(){
+    public void testRiskType() {
         RiskType data = new RiskType();
         data.preUpdate();
         data.prePersist();
@@ -122,17 +183,17 @@ public class CommonDictionaryJPATest {
         data.setDescription("Test");
         assertTrue("Test".equals(data.getDescription()));
         data.setCreatedDate(new Date());
-        assertTrue(data.getCreatedDate()!=null);
+        assertTrue(data.getCreatedDate() != null);
         data.setModifiedDate(new Date());
-        assertTrue(data.getModifiedDate()!=null);
+        assertTrue(data.getModifiedDate() != null);
         data.setUserCreatedBy(userInfo);
-        assertTrue(data.getUserCreatedBy()!=null);
+        assertTrue(data.getUserCreatedBy() != null);
         data.setUserModifiedBy(userInfo);
-        assertTrue(data.getUserModifiedBy()!=null);
+        assertTrue(data.getUserModifiedBy() != null);
     }
 
     @Test
-    public void testSafePolicyWarning(){
+    public void testSafePolicyWarning() {
         SafePolicyWarning data = new SafePolicyWarning();
         data.setId(1);
         assertTrue(1 == data.getId());