You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by pr...@apache.org on 2025/01/09 05:34:55 UTC

(ranger) branch RANGER-5061_vyom created (now d6151647c)

This is an automated email from the ASF dual-hosted git repository.

pradeep pushed a change to branch RANGER-5061_vyom
in repository https://gitbox.apache.org/repos/asf/ranger.git


      at d6151647c RANGER-5061: checkstyle compliance updates - security-admin modules

This branch includes the following new commits:

     new d6151647c RANGER-5061: checkstyle compliance updates - security-admin modules

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



(ranger) 01/01: RANGER-5061: checkstyle compliance updates - security-admin modules

Posted by pr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

pradeep pushed a commit to branch RANGER-5061_vyom
in repository https://gitbox.apache.org/repos/asf/ranger.git

commit d6151647c5c3dd8714c6c6e874c570faa75d6943
Author: Vyom Mani Tiwari <vt...@cloudera.com>
AuthorDate: Fri Jan 3 16:07:15 2025 +0530

    RANGER-5061: checkstyle compliance updates - security-admin modules
    
    - org.apache.ranger.entity package
---
 .../org/apache/ranger/entity/XXAccessAudit.java    |  157 +-
 .../apache/ranger/entity/XXAccessAuditBase.java    | 1223 ++++++++-------
 .../org/apache/ranger/entity/XXAccessAuditV4.java  |   15 +-
 .../org/apache/ranger/entity/XXAccessAuditV5.java  |   93 +-
 .../org/apache/ranger/entity/XXAccessTypeDef.java  |  579 ++++---
 .../ranger/entity/XXAccessTypeDefGrants.java       |  272 ++--
 .../java/org/apache/ranger/entity/XXAsset.java     |  463 +++---
 .../java/org/apache/ranger/entity/XXAuditMap.java  |  375 +++--
 .../org/apache/ranger/entity/XXAuthSession.java    |  892 ++++++-----
 .../apache/ranger/entity/XXContextEnricherDef.java |  540 ++++---
 .../apache/ranger/entity/XXCredentialStore.java    |  255 ++-
 .../java/org/apache/ranger/entity/XXDBBase.java    |  408 +++--
 .../java/org/apache/ranger/entity/XXDataHist.java  |  870 ++++++-----
 .../apache/ranger/entity/XXDataMaskTypeDef.java    |  845 +++++-----
 .../java/org/apache/ranger/entity/XXEnumDef.java   |  432 +++---
 .../org/apache/ranger/entity/XXEnumElementDef.java |  516 +++----
 .../org/apache/ranger/entity/XXGdsDataShare.java   |  142 +-
 .../ranger/entity/XXGdsDataShareInDataset.java     |  122 +-
 .../org/apache/ranger/entity/XXGdsDataset.java     |  120 +-
 .../ranger/entity/XXGdsDatasetInProject.java       |  125 +-
 .../ranger/entity/XXGdsDatasetPolicyMap.java       |   42 +-
 .../org/apache/ranger/entity/XXGdsProject.java     |  101 +-
 .../ranger/entity/XXGdsProjectPolicyMap.java       |   42 +-
 .../apache/ranger/entity/XXGdsSharedResource.java  |  166 +-
 .../org/apache/ranger/entity/XXGlobalState.java    |   20 +-
 .../apache/ranger/entity/XXGlobalStateBase.java    |   19 +-
 .../java/org/apache/ranger/entity/XXGroup.java     |  626 ++++----
 .../org/apache/ranger/entity/XXGroupGroup.java     |  315 ++--
 .../apache/ranger/entity/XXGroupPermission.java    |  265 ++--
 .../java/org/apache/ranger/entity/XXGroupUser.java |  318 ++--
 .../java/org/apache/ranger/entity/XXModuleDef.java |  184 +--
 .../java/org/apache/ranger/entity/XXPermMap.java   |  720 +++++----
 .../org/apache/ranger/entity/XXPluginInfo.java     |  365 ++---
 .../java/org/apache/ranger/entity/XXPolicy.java    |   90 +-
 .../org/apache/ranger/entity/XXPolicyBase.java     |  766 +++++-----
 .../apache/ranger/entity/XXPolicyChangeLog.java    |  155 +-
 .../apache/ranger/entity/XXPolicyConditionDef.java | 1073 +++++++------
 .../apache/ranger/entity/XXPolicyExportAudit.java  |  724 +++++----
 .../org/apache/ranger/entity/XXPolicyItem.java     |  576 ++++---
 .../apache/ranger/entity/XXPolicyItemAccess.java   |  460 +++---
 .../ranger/entity/XXPolicyItemCondition.java       |  460 +++---
 .../ranger/entity/XXPolicyItemDataMaskInfo.java    |  434 +++---
 .../ranger/entity/XXPolicyItemGroupPerm.java       |  364 +++--
 .../ranger/entity/XXPolicyItemRowFilterInfo.java   |  272 ++--
 .../apache/ranger/entity/XXPolicyItemUserPerm.java |  372 +++--
 .../org/apache/ranger/entity/XXPolicyLabel.java    |  211 ++-
 .../org/apache/ranger/entity/XXPolicyLabelMap.java |  269 ++--
 .../ranger/entity/XXPolicyRefAccessType.java       |  321 ++--
 .../apache/ranger/entity/XXPolicyRefCondition.java |  321 ++--
 .../ranger/entity/XXPolicyRefDataMaskType.java     |  322 ++--
 .../org/apache/ranger/entity/XXPolicyRefGroup.java |  319 ++--
 .../apache/ranger/entity/XXPolicyRefResource.java  |  321 ++--
 .../org/apache/ranger/entity/XXPolicyRefRole.java  |  132 +-
 .../org/apache/ranger/entity/XXPolicyRefUser.java  |  321 ++--
 .../org/apache/ranger/entity/XXPolicyResource.java |  418 +++--
 .../apache/ranger/entity/XXPolicyResourceMap.java  |  364 +++--
 .../ranger/entity/XXPolicyWithAssignedId.java      |   73 +-
 .../org/apache/ranger/entity/XXPortalUser.java     |  835 +++++-----
 .../org/apache/ranger/entity/XXPortalUserRole.java |  302 ++--
 .../apache/ranger/entity/XXRMSMappingProvider.java |   70 +-
 .../apache/ranger/entity/XXRMSNotification.java    |  225 +--
 .../apache/ranger/entity/XXRMSResourceMapping.java |  119 +-
 .../apache/ranger/entity/XXRMSServiceResource.java |  443 +++---
 .../java/org/apache/ranger/entity/XXResource.java  | 1360 ++++++++--------
 .../org/apache/ranger/entity/XXResourceDef.java    | 1616 ++++++++++----------
 .../main/java/org/apache/ranger/entity/XXRole.java |   32 +-
 .../java/org/apache/ranger/entity/XXRoleBase.java  |   27 +-
 .../org/apache/ranger/entity/XXRoleRefGroup.java   |  153 +-
 .../org/apache/ranger/entity/XXRoleRefRole.java    |  154 +-
 .../org/apache/ranger/entity/XXRoleRefUser.java    |  151 +-
 .../org/apache/ranger/entity/XXSecurityZone.java   |   20 +-
 .../apache/ranger/entity/XXSecurityZoneBase.java   |   30 +-
 .../ranger/entity/XXSecurityZoneRefGroup.java      |  327 ++--
 .../ranger/entity/XXSecurityZoneRefResource.java   |  270 ++--
 .../ranger/entity/XXSecurityZoneRefRole.java       |  266 ++--
 .../ranger/entity/XXSecurityZoneRefService.java    |  271 ++--
 .../ranger/entity/XXSecurityZoneRefTagService.java |  121 +-
 .../ranger/entity/XXSecurityZoneRefUser.java       |  327 ++--
 .../java/org/apache/ranger/entity/XXService.java   |   90 +-
 .../org/apache/ranger/entity/XXServiceBase.java    |  744 +++++----
 .../apache/ranger/entity/XXServiceConfigDef.java   | 1201 +++++++--------
 .../apache/ranger/entity/XXServiceConfigMap.java   |  364 +++--
 .../org/apache/ranger/entity/XXServiceDef.java     |  111 +-
 .../org/apache/ranger/entity/XXServiceDefBase.java |  783 +++++-----
 .../ranger/entity/XXServiceDefWithAssignedId.java  |   77 +-
 .../apache/ranger/entity/XXServiceResource.java    |  485 +++---
 .../ranger/entity/XXServiceResourceElement.java    |  368 ++---
 .../entity/XXServiceResourceElementValue.java      |  313 ++--
 .../apache/ranger/entity/XXServiceVersionInfo.java |  405 ++---
 .../ranger/entity/XXServiceWithAssignedId.java     |   79 +-
 .../main/java/org/apache/ranger/entity/XXTag.java  |  406 ++---
 .../org/apache/ranger/entity/XXTagAttribute.java   |  317 ++--
 .../apache/ranger/entity/XXTagAttributeDef.java    |  315 ++--
 .../org/apache/ranger/entity/XXTagChangeLog.java   |  103 +-
 .../java/org/apache/ranger/entity/XXTagDef.java    |  449 +++---
 .../org/apache/ranger/entity/XXTagResourceMap.java |  317 ++--
 .../java/org/apache/ranger/entity/XXTrxLog.java    |  988 ++++++------
 .../java/org/apache/ranger/entity/XXTrxLogV2.java  |  149 +-
 .../apache/ranger/entity/XXUgsyncAuditInfo.java    |  432 +++---
 .../main/java/org/apache/ranger/entity/XXUser.java |  540 ++++---
 .../org/apache/ranger/entity/XXUserPermission.java |  270 ++--
 .../apache/ranger/entity/view/VXXPrincipal.java    |  355 ++---
 102 files changed, 18582 insertions(+), 18963 deletions(-)

diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXAccessAudit.java b/security-admin/src/main/java/org/apache/ranger/entity/XXAccessAudit.java
index 0b0c1e4fa..bb6981c0e 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXAccessAudit.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXAccessAudit.java
@@ -17,11 +17,10 @@
  * under the License.
  */
 
- package org.apache.ranger.entity;
+package org.apache.ranger.entity;
 
 /**
  * Access Audit
- *
  */
 
 import javax.persistence.Column;
@@ -29,82 +28,84 @@ import javax.persistence.Entity;
 import javax.persistence.Table;
 
 @Entity
-@Table(name="xa_access_audit")
+@Table(name = "xa_access_audit")
 public class XXAccessAudit extends XXAccessAuditBase implements java.io.Serializable {
-	private static final long serialVersionUID = 1L;
-
-	@Column(name="SEQ_NUM")
-	protected long sequenceNumber;
-
-	@Column(name="EVENT_COUNT")
-	protected long eventCount;
-
-	//event duration in ms
-	@Column(name="EVENT_DUR_MS")
-	protected long eventDuration;
-
-	public long getSequenceNumber() {
-		return sequenceNumber;
-	}
-	public void setSequenceNumber(long sequenceNumber) {
-		this.sequenceNumber = sequenceNumber;
-	}
-	public long getEventCount() {
-		return eventCount;
-	}
-	public void setEventCount(long eventCount) {
-		this.eventCount = eventCount;
-	}
-	public long getEventDuration() {
-		return eventDuration;
-	}
-	public void setEventDuration(long eventDuration) {
-		this.eventDuration = eventDuration;
-	}
-
-	@Column(name="tags")
-	protected String tags;
-	
-	/**
-	 * @return the tags
-	 */
-	public String getTags() {
-		return tags;
-	}
-	/**
-	 * @param tags the tags to set
-	 */
-	public void setTags(String tags) {
-		this.tags = tags;
-	}
-	/**
-	 * This return the bean content in string format
-	 * @return formatedStr
-	*/
-	@Override
-	public String toString( ) {
-		String str = super.toString();
-		str += "sequenceNumber={" + sequenceNumber + "}";
-		str += "eventCount={" + eventCount + "}";
-		str += "eventDuration={" + eventDuration + "}";
-		str += "tags={" + tags + "}";
-		return str;
-	}
-
-	/**
-	 * Checks for all attributes except referenced db objects
-	 * @return true if all attributes match
-	*/
-	@Override
-	public boolean equals( Object obj) {
-		if ( !super.equals(obj) ) {
-			return false;
-		}
-		XXAccessAudit other = (XXAccessAudit) obj;
-		if ((this.tags == null && other.tags != null) || (this.tags != null && !this.tags.equals(other.tags))) {
-			return false;
-		}
-		return true;
-	}
+    private static final long serialVersionUID = 1L;
+
+    @Column(name = "SEQ_NUM")
+    protected long sequenceNumber;
+
+    @Column(name = "EVENT_COUNT")
+    protected long eventCount;
+
+    //event duration in ms
+    @Column(name = "EVENT_DUR_MS")
+    protected long eventDuration;
+    @Column(name = "tags")
+    protected String tags;
+
+    public long getSequenceNumber() {
+        return sequenceNumber;
+    }
+
+    public void setSequenceNumber(long sequenceNumber) {
+        this.sequenceNumber = sequenceNumber;
+    }
+
+    public long getEventCount() {
+        return eventCount;
+    }
+
+    public void setEventCount(long eventCount) {
+        this.eventCount = eventCount;
+    }
+
+    public long getEventDuration() {
+        return eventDuration;
+    }
+
+    public void setEventDuration(long eventDuration) {
+        this.eventDuration = eventDuration;
+    }
+
+    /**
+     * @return the tags
+     */
+    public String getTags() {
+        return tags;
+    }
+
+    /**
+     * @param tags the tags to set
+     */
+    public void setTags(String tags) {
+        this.tags = tags;
+    }
+
+    /**
+     * This return the bean content in string format
+     * @return formatedStr
+     */
+    @Override
+    public String toString() {
+        String str = super.toString();
+        str += "sequenceNumber={" + sequenceNumber + "}";
+        str += "eventCount={" + eventCount + "}";
+        str += "eventDuration={" + eventDuration + "}";
+        str += "tags={" + tags + "}";
+        return str;
+    }
 
+    /**
+     * Checks for all attributes except referenced db objects
+     * @return true if all attributes match
+     */
+    @Override
+    public boolean equals(Object obj) {
+        if (!super.equals(obj)) {
+            return false;
+        }
+        XXAccessAudit other = (XXAccessAudit) obj;
+        return (this.tags != null || other.tags == null) && (this.tags == null || this.tags.equals(other.tags));
+    }
 }
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXAccessAuditBase.java b/security-admin/src/main/java/org/apache/ranger/entity/XXAccessAuditBase.java
index c00a69da0..b92f49c7e 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXAccessAuditBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXAccessAuditBase.java
@@ -17,14 +17,15 @@
  * under the License.
  */
 
- package org.apache.ranger.entity;
+package org.apache.ranger.entity;
 
 /**
  * Access Audit
- *
  */
 
-import java.util.Date;
+import org.apache.ranger.common.AppConstants;
+import org.apache.ranger.common.DateUtil;
+import org.apache.ranger.common.RangerConstants;
 
 import javax.persistence.Column;
 import javax.persistence.GeneratedValue;
@@ -35,623 +36,607 @@ import javax.persistence.SequenceGenerator;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 
-import org.apache.ranger.common.AppConstants;
-import org.apache.ranger.common.DateUtil;
-import org.apache.ranger.common.RangerConstants;
+import java.util.Date;
 
 @MappedSuperclass
 public class XXAccessAuditBase extends XXDBBase implements java.io.Serializable {
-	private static final long serialVersionUID = 1L;
-
-	@Id
-	@SequenceGenerator(name="XA_ACCESS_AUDIT_SEQ",sequenceName="XA_ACCESS_AUDIT_SEQ",allocationSize=1)
-	@GeneratedValue(strategy=GenerationType.AUTO,generator="XA_ACCESS_AUDIT_SEQ")
-	@Column(name="ID")
-	protected Long id;
-
-	@Override
-	public void setId(Long id) {
-		this.id=id;
-	}
-	@Override
-	public Long getId() {
-		return id;
-	}
-
-	/**
-	 * Repository Type
-	 * <ul>
-	 * <li>This attribute is of type enum CommonEnums::AssetType
-	 * </ul>
-	 *
-	 */
-	@Column(name="AUDIT_TYPE"  , nullable=false )
-	protected int auditType = AppConstants.ASSET_UNKNOWN;
-
-	/**
-	 * Access Result
-	 * <ul>
-	 * <li>This attribute is of type enum CommonEnums::AccessResult
-	 * </ul>
-	 *
-	 */
-	@Column(name="ACCESS_RESULT"   )
-	protected int accessResult = RangerConstants.ACCESS_RESULT_DENIED;
-
-	/**
-	 * Access Type
-	 * <ul>
-	 * <li>The maximum length for this attribute is <b>255</b>.
-	 * </ul>
-	 *
-	 */
-	@Column(name="ACCESS_TYPE"   , length=255)
-	protected String accessType;
-
-	/**
-	 * Acl Enforcer
-	 * <ul>
-	 * <li>The maximum length for this attribute is <b>255</b>.
-	 * </ul>
-	 *
-	 */
-	@Column(name="ACL_ENFORCER"   , length=255)
-	protected String aclEnforcer;
-
-	/**
-	 * Agent Id
-	 * <ul>
-	 * <li>The maximum length for this attribute is <b>255</b>.
-	 * </ul>
-	 *
-	 */
-	@Column(name="AGENT_ID"   , length=255)
-	protected String agentId;
-
-	/**
-	 * Client Ip
-	 * <ul>
-	 * <li>The maximum length for this attribute is <b>255</b>.
-	 * </ul>
-	 *
-	 */
-	@Column(name="CLIENT_IP"   , length=255)
-	protected String clientIP;
-
-	/**
-	 * Client Type
-	 * <ul>
-	 * <li>The maximum length for this attribute is <b>255</b>.
-	 * </ul>
-	 *
-	 */
-	@Column(name="CLIENT_TYPE"   , length=255)
-	protected String clientType;
-
-	/**
-	 * Policy Id
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Column(name="POLICY_ID"   )
-	protected long policyId;
-
-	/**
-	 * Repository Name
-	 * <ul>
-	 * <li>The maximum length for this attribute is <b>255</b>.
-	 * </ul>
-	 *
-	 */
-	@Column(name="REPO_NAME"   , length=255)
-	protected String repoName;
-
-	/**
-	 * Repository Type
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Column(name="REPO_TYPE"   )
-	protected int repoType;
-
-	/**
-	 * Reason of result
-	 * <ul>
-	 * <li>The maximum length for this attribute is <b>255</b>.
-	 * </ul>
-	 *
-	 */
-	@Column(name="RESULT_REASON"   , length=255)
-	protected String resultReason;
-
-	/**
-	 * Session Id
-	 * <ul>
-	 * <li>The maximum length for this attribute is <b>255</b>.
-	 * </ul>
-	 *
-	 */
-	@Column(name="SESSION_ID"   , length=255)
-	protected String sessionId;
-
-	/**
-	 * Event Time
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name="EVENT_TIME"   )
-	protected Date eventTime = DateUtil.getUTCDate();
-
-	/**
-	 * Requesting User
-	 * <ul>
-	 * <li>The maximum length for this attribute is <b>255</b>.
-	 * </ul>
-	 *
-	 */
-	@Column(name="REQUEST_USER"   , length=255)
-	protected String requestUser;
-
-	/**
-	 * Action
-	 * <ul>
-	 * <li>The maximum length for this attribute is <b>2000</b>.
-	 * </ul>
-	 *
-	 */
-	@Column(name="ACTION"   , length=2000)
-	protected String action;
-
-	/**
-	 * Requesting Data
-	 * <ul>
-	 * <li>The maximum length for this attribute is <b>2000</b>.
-	 * </ul>
-	 *
-	 */
-	@Column(name="REQUEST_DATA"   , length=2000)
-	protected String requestData;
-
-	/**
-	 * Resource Path
-	 * <ul>
-	 * <li>The maximum length for this attribute is <b>2000</b>.
-	 * </ul>
-	 *
-	 */
-	@Column(name="RESOURCE_PATH"   , length=2000)
-	protected String resourcePath;
-
-	/**
-	 * Resource Type
-	 * <ul>
-	 * <li>The maximum length for this attribute is <b>255</b>.
-	 * </ul>
-	 *
-	 */
-	@Column(name="RESOURCE_TYPE"   , length=255)
-	protected String resourceType;
-
-	
-	
-	/**
-	 * Default constructor. This will set all the attributes to default value.
-	 */
-	public XXAccessAuditBase ( ) {
-		auditType = AppConstants.ASSET_UNKNOWN;
-		accessResult = RangerConstants.ACCESS_RESULT_DENIED;
-	}
-
-	@Override
-	public int getMyClassType( ) {
-	    return AppConstants.CLASS_TYPE_XA_ACCESS_AUDIT;
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b>auditType</b>.
-	 * You cannot set null to the attribute.
-	 * @param auditType Value to set member attribute <b>auditType</b>
-	 */
-	public void setAuditType( int auditType ) {
-		this.auditType = auditType;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>auditType</b>
-	 * @return int - value of member attribute <b>auditType</b>.
-	 */
-	public int getAuditType( ) {
-		return this.auditType;
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b>accessResult</b>.
-	 * You cannot set null to the attribute.
-	 * @param accessResult Value to set member attribute <b>accessResult</b>
-	 */
-	public void setAccessResult( int accessResult ) {
-		this.accessResult = accessResult;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>accessResult</b>
-	 * @return int - value of member attribute <b>accessResult</b>.
-	 */
-	public int getAccessResult( ) {
-		return this.accessResult;
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b>accessType</b>.
-	 * You cannot set null to the attribute.
-	 * @param accessType Value to set member attribute <b>accessType</b>
-	 */
-	public void setAccessType( String accessType ) {
-		this.accessType = accessType;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>accessType</b>
-	 * @return String - value of member attribute <b>accessType</b>.
-	 */
-	public String getAccessType( ) {
-		return this.accessType;
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b>aclEnforcer</b>.
-	 * You cannot set null to the attribute.
-	 * @param aclEnforcer Value to set member attribute <b>aclEnforcer</b>
-	 */
-	public void setAclEnforcer( String aclEnforcer ) {
-		this.aclEnforcer = aclEnforcer;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>aclEnforcer</b>
-	 * @return String - value of member attribute <b>aclEnforcer</b>.
-	 */
-	public String getAclEnforcer( ) {
-		return this.aclEnforcer;
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b>agentId</b>.
-	 * You cannot set null to the attribute.
-	 * @param agentId Value to set member attribute <b>agentId</b>
-	 */
-	public void setAgentId( String agentId ) {
-		this.agentId = agentId;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>agentId</b>
-	 * @return String - value of member attribute <b>agentId</b>.
-	 */
-	public String getAgentId( ) {
-		return this.agentId;
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b>clientIP</b>.
-	 * You cannot set null to the attribute.
-	 * @param clientIP Value to set member attribute <b>clientIP</b>
-	 */
-	public void setClientIP( String clientIP ) {
-		this.clientIP = clientIP;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>clientIP</b>
-	 * @return String - value of member attribute <b>clientIP</b>.
-	 */
-	public String getClientIP( ) {
-		return this.clientIP;
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b>clientType</b>.
-	 * You cannot set null to the attribute.
-	 * @param clientType Value to set member attribute <b>clientType</b>
-	 */
-	public void setClientType( String clientType ) {
-		this.clientType = clientType;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>clientType</b>
-	 * @return String - value of member attribute <b>clientType</b>.
-	 */
-	public String getClientType( ) {
-		return this.clientType;
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b>policyId</b>.
-	 * You cannot set null to the attribute.
-	 * @param policyId Value to set member attribute <b>policyId</b>
-	 */
-	public void setPolicyId( long policyId ) {
-		this.policyId = policyId;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>policyId</b>
-	 * @return long - value of member attribute <b>policyId</b>.
-	 */
-	public long getPolicyId( ) {
-		return this.policyId;
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b>repoName</b>.
-	 * You cannot set null to the attribute.
-	 * @param repoName Value to set member attribute <b>repoName</b>
-	 */
-	public void setRepoName( String repoName ) {
-		this.repoName = repoName;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>repoName</b>
-	 * @return String - value of member attribute <b>repoName</b>.
-	 */
-	public String getRepoName( ) {
-		return this.repoName;
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b>repoType</b>.
-	 * You cannot set null to the attribute.
-	 * @param repoType Value to set member attribute <b>repoType</b>
-	 */
-	public void setRepoType( int repoType ) {
-		this.repoType = repoType;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>repoType</b>
-	 * @return int - value of member attribute <b>repoType</b>.
-	 */
-	public int getRepoType( ) {
-		return this.repoType;
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b>resultReason</b>.
-	 * You cannot set null to the attribute.
-	 * @param resultReason Value to set member attribute <b>resultReason</b>
-	 */
-	public void setResultReason( String resultReason ) {
-		this.resultReason = resultReason;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>resultReason</b>
-	 * @return String - value of member attribute <b>resultReason</b>.
-	 */
-	public String getResultReason( ) {
-		return this.resultReason;
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b>sessionId</b>.
-	 * You cannot set null to the attribute.
-	 * @param sessionId Value to set member attribute <b>sessionId</b>
-	 */
-	public void setSessionId( String sessionId ) {
-		this.sessionId = sessionId;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>sessionId</b>
-	 * @return String - value of member attribute <b>sessionId</b>.
-	 */
-	public String getSessionId( ) {
-		return this.sessionId;
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b>eventTime</b>.
-	 * You cannot set null to the attribute.
-	 * @param eventTime Value to set member attribute <b>eventTime</b>
-	 */
-	public void setEventTime( Date eventTime ) {
-		this.eventTime = eventTime;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>eventTime</b>
-	 * @return Date - value of member attribute <b>eventTime</b>.
-	 */
-	public Date getEventTime( ) {
-		return this.eventTime;
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b>requestUser</b>.
-	 * You cannot set null to the attribute.
-	 * @param requestUser Value to set member attribute <b>requestUser</b>
-	 */
-	public void setRequestUser( String requestUser ) {
-		this.requestUser = requestUser;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>requestUser</b>
-	 * @return String - value of member attribute <b>requestUser</b>.
-	 */
-	public String getRequestUser( ) {
-		return this.requestUser;
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b>action</b>.
-	 * You cannot set null to the attribute.
-	 * @param action Value to set member attribute <b>action</b>
-	 */
-	public void setAction( String action ) {
-		this.action = action;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>action</b>
-	 * @return String - value of member attribute <b>action</b>.
-	 */
-	public String getAction( ) {
-		return this.action;
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b>requestData</b>.
-	 * You cannot set null to the attribute.
-	 * @param requestData Value to set member attribute <b>requestData</b>
-	 */
-	public void setRequestData( String requestData ) {
-		this.requestData = requestData;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>requestData</b>
-	 * @return String - value of member attribute <b>requestData</b>.
-	 */
-	public String getRequestData( ) {
-		return this.requestData;
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b>resourcePath</b>.
-	 * You cannot set null to the attribute.
-	 * @param resourcePath Value to set member attribute <b>resourcePath</b>
-	 */
-	public void setResourcePath( String resourcePath ) {
-		this.resourcePath = resourcePath;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>resourcePath</b>
-	 * @return String - value of member attribute <b>resourcePath</b>.
-	 */
-	public String getResourcePath( ) {
-		return this.resourcePath;
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b>resourceType</b>.
-	 * You cannot set null to the attribute.
-	 * @param resourceType Value to set member attribute <b>resourceType</b>
-	 */
-	public void setResourceType( String resourceType ) {
-		this.resourceType = resourceType;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>resourceType</b>
-	 * @return String - value of member attribute <b>resourceType</b>.
-	 */
-	public String getResourceType( ) {
-		return this.resourceType;
-	}
-
-	/**
-	 * This return the bean content in string format
-	 * @return formatedStr
-	*/
-	@Override
-	public String toString( ) {
-		String str = "XXAccessAudit=";
-		str += super.toString();
-		str += "id={" + id + "} ";
-		str += "auditType={" + auditType + "} ";
-		str += "accessResult={" + accessResult + "} ";
-		str += "accessType={" + accessType + "} ";
-		str += "aclEnforcer={" + aclEnforcer + "} ";
-		str += "agentId={" + agentId + "} ";
-		str += "clientIP={" + clientIP + "} ";
-		str += "clientType={" + clientType + "} ";
-		str += "policyId={" + policyId + "} ";
-		str += "repoName={" + repoName + "} ";
-		str += "repoType={" + repoType + "} ";
-		str += "resultReason={" + resultReason + "} ";
-		str += "eventTime={" + eventTime + "} ";
-		str += "requestUser={" + requestUser + "} ";
-		str += "action={" + action + "} ";
-		str += "requestData={" + requestData + "} ";
-		str += "resourcePath={" + resourcePath + "} ";
-		str += "resourceType={" + resourceType + "} ";
-		return str;
-	}
-
-	/**
-	 * Checks for all attributes except referenced db objects
-	 * @return true if all attributes match
-	*/
-	@Override
-	public boolean equals( Object obj) {
-		if ( !super.equals(obj) ) {
-			return false;
-		}
-		XXAccessAuditBase other = (XXAccessAuditBase) obj;
-		if( this.auditType != other.auditType ) return false;
-		if( this.accessResult != other.accessResult ) return false;
-    	if ((this.accessType == null && other.accessType != null) || (this.accessType != null && !this.accessType.equals(other.accessType))) {
-        		return false;
-    	}
-    	if ((this.aclEnforcer == null && other.aclEnforcer != null) || (this.aclEnforcer != null && !this.aclEnforcer.equals(other.aclEnforcer))) {
-        		return false;
-    	}
-    	if ((this.agentId == null && other.agentId != null) || (this.agentId != null && !this.agentId.equals(other.agentId))) {
-        		return false;
-    	}
-    	if ((this.clientIP == null && other.clientIP != null) || (this.clientIP != null && !this.clientIP.equals(other.clientIP))) {
-        		return false;
-    	}
-    	if ((this.clientType == null && other.clientType != null) || (this.clientType != null && !this.clientType.equals(other.clientType))) {
-        		return false;
-    	}
-    	if( this.policyId != other.policyId ) return false;
-    	if ((this.repoName == null && other.repoName != null) || (this.repoName != null && !this.repoName.equals(other.repoName))) {
-        		return false;
-    	}
-    	if( this.repoType != other.repoType ) return false;
-    	if ((this.resultReason == null && other.resultReason != null) || (this.resultReason != null && !this.resultReason.equals(other.resultReason))) {
-        		return false;
-    	}
-    	if ((this.sessionId == null && other.sessionId != null) || (this.sessionId != null && !this.sessionId.equals(other.sessionId))) {
-        		return false;
-    	}
-    	if ((this.eventTime == null && other.eventTime != null) || (this.eventTime != null && !this.eventTime.equals(other.eventTime))) {
-        		return false;
-    	}
-    	if ((this.requestUser == null && other.requestUser != null) || (this.requestUser != null && !this.requestUser.equals(other.requestUser))) {
-        		return false;
-    	}
-    	if ((this.action == null && other.action != null) || (this.action != null && !this.action.equals(other.action))) {
-        		return false;
-    	}
-    	if ((this.requestData == null && other.requestData != null) || (this.requestData != null && !this.requestData.equals(other.requestData))) {
-        		return false;
-    	}
-    	if ((this.resourcePath == null && other.resourcePath != null) || (this.resourcePath != null && !this.resourcePath.equals(other.resourcePath))) {
-        		return false;
-    	}
-    	if ((this.resourceType == null && other.resourceType != null) || (this.resourceType != null && !this.resourceType.equals(other.resourceType))) {
-        		return false;
-    	}
-		return true;
-	}
-	public static String getEnumName(String fieldName ) {
-		if( "auditType".equals(fieldName) ) {
-			return "CommonEnums.AssetType";
-		}
-		if( "accessResult".equals(fieldName) ) {
-			return "CommonEnums.AccessResult";
-		}
-		return null;
-	}
-
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @SequenceGenerator(name = "XA_ACCESS_AUDIT_SEQ", sequenceName = "XA_ACCESS_AUDIT_SEQ", allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.AUTO, generator = "XA_ACCESS_AUDIT_SEQ")
+    @Column(name = "ID")
+    protected Long id;
+    /**
+     * Repository Type
+     * <ul>
+     * <li>This attribute is of type enum CommonEnums::AssetType
+     * </ul>
+     *
+     */
+    @Column(name = "AUDIT_TYPE", nullable = false)
+    protected int auditType = AppConstants.ASSET_UNKNOWN;
+    /**
+     * Access Result
+     * <ul>
+     * <li>This attribute is of type enum CommonEnums::AccessResult
+     * </ul>
+     *
+     */
+    @Column(name = "ACCESS_RESULT")
+    protected int accessResult = RangerConstants.ACCESS_RESULT_DENIED;
+    /**
+     * Access Type
+     * <ul>
+     * <li>The maximum length for this attribute is <b>255</b>.
+     * </ul>
+     *
+     */
+    @Column(name = "ACCESS_TYPE", length = 255)
+    protected String accessType;
+    /**
+     * Acl Enforcer
+     * <ul>
+     * <li>The maximum length for this attribute is <b>255</b>.
+     * </ul>
+     *
+     */
+    @Column(name = "ACL_ENFORCER", length = 255)
+    protected String aclEnforcer;
+    /**
+     * Agent Id
+     * <ul>
+     * <li>The maximum length for this attribute is <b>255</b>.
+     * </ul>
+     *
+     */
+    @Column(name = "AGENT_ID", length = 255)
+    protected String agentId;
+    /**
+     * Client Ip
+     * <ul>
+     * <li>The maximum length for this attribute is <b>255</b>.
+     * </ul>
+     *
+     */
+    @Column(name = "CLIENT_IP", length = 255)
+    protected String clientIP;
+    /**
+     * Client Type
+     * <ul>
+     * <li>The maximum length for this attribute is <b>255</b>.
+     * </ul>
+     *
+     */
+    @Column(name = "CLIENT_TYPE", length = 255)
+    protected String clientType;
+    /**
+     * Policy Id
+     * <ul>
+     * </ul>
+     *
+     */
+    @Column(name = "POLICY_ID")
+    protected long policyId;
+    /**
+     * Repository Name
+     * <ul>
+     * <li>The maximum length for this attribute is <b>255</b>.
+     * </ul>
+     *
+     */
+    @Column(name = "REPO_NAME", length = 255)
+    protected String repoName;
+    /**
+     * Repository Type
+     * <ul>
+     * </ul>
+     *
+     */
+    @Column(name = "REPO_TYPE")
+    protected int repoType;
+    /**
+     * Reason of result
+     * <ul>
+     * <li>The maximum length for this attribute is <b>255</b>.
+     * </ul>
+     *
+     */
+    @Column(name = "RESULT_REASON", length = 255)
+    protected String resultReason;
+    /**
+     * Session Id
+     * <ul>
+     * <li>The maximum length for this attribute is <b>255</b>.
+     * </ul>
+     *
+     */
+    @Column(name = "SESSION_ID", length = 255)
+    protected String sessionId;
+    /**
+     * Event Time
+     * <ul>
+     * </ul>
+     *
+     */
+    @Temporal(TemporalType.TIMESTAMP)
+    @Column(name = "EVENT_TIME")
+    protected Date eventTime = DateUtil.getUTCDate();
+    /**
+     * Requesting User
+     * <ul>
+     * <li>The maximum length for this attribute is <b>255</b>.
+     * </ul>
+     *
+     */
+    @Column(name = "REQUEST_USER", length = 255)
+    protected String requestUser;
+    /**
+     * Action
+     * <ul>
+     * <li>The maximum length for this attribute is <b>2000</b>.
+     * </ul>
+     *
+     */
+    @Column(name = "ACTION", length = 2000)
+    protected String action;
+    /**
+     * Requesting Data
+     * <ul>
+     * <li>The maximum length for this attribute is <b>2000</b>.
+     * </ul>
+     *
+     */
+    @Column(name = "REQUEST_DATA", length = 2000)
+    protected String requestData;
+    /**
+     * Resource Path
+     * <ul>
+     * <li>The maximum length for this attribute is <b>2000</b>.
+     * </ul>
+     *
+     */
+    @Column(name = "RESOURCE_PATH", length = 2000)
+    protected String resourcePath;
+    /**
+     * Resource Type
+     * <ul>
+     * <li>The maximum length for this attribute is <b>255</b>.
+     * </ul>
+     *
+     */
+    @Column(name = "RESOURCE_TYPE", length = 255)
+    protected String resourceType;
+
+    /**
+     * Default constructor. This will set all the attributes to default value.
+     */
+    public XXAccessAuditBase() {
+        auditType    = AppConstants.ASSET_UNKNOWN;
+        accessResult = RangerConstants.ACCESS_RESULT_DENIED;
+    }
+
+    public static String getEnumName(String fieldName) {
+        if ("auditType".equals(fieldName)) {
+            return "CommonEnums.AssetType";
+        }
+        if ("accessResult".equals(fieldName)) {
+            return "CommonEnums.AccessResult";
+        }
+        return null;
+    }
+
+    @Override
+    public int getMyClassType() {
+        return AppConstants.CLASS_TYPE_XA_ACCESS_AUDIT;
+    }
+
+    @Override
+    public Long getId() {
+        return id;
+    }
+
+    @Override
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * Checks for all attributes except referenced db objects
+     * @return true if all attributes match
+     */
+    @Override
+    public boolean equals(Object obj) {
+        if (!super.equals(obj)) {
+            return false;
+        }
+        XXAccessAuditBase other = (XXAccessAuditBase) obj;
+        if (this.auditType != other.auditType) {
+            return false;
+        }
+        if (this.accessResult != other.accessResult) {
+            return false;
+        }
+        if ((this.accessType == null && other.accessType != null) || (this.accessType != null && !this.accessType.equals(other.accessType))) {
+            return false;
+        }
+        if ((this.aclEnforcer == null && other.aclEnforcer != null) || (this.aclEnforcer != null && !this.aclEnforcer.equals(other.aclEnforcer))) {
+            return false;
+        }
+        if ((this.agentId == null && other.agentId != null) || (this.agentId != null && !this.agentId.equals(other.agentId))) {
+            return false;
+        }
+        if ((this.clientIP == null && other.clientIP != null) || (this.clientIP != null && !this.clientIP.equals(other.clientIP))) {
+            return false;
+        }
+        if ((this.clientType == null && other.clientType != null) || (this.clientType != null && !this.clientType.equals(other.clientType))) {
+            return false;
+        }
+        if (this.policyId != other.policyId) {
+            return false;
+        }
+        if ((this.repoName == null && other.repoName != null) || (this.repoName != null && !this.repoName.equals(other.repoName))) {
+            return false;
+        }
+        if (this.repoType != other.repoType) {
+            return false;
+        }
+        if ((this.resultReason == null && other.resultReason != null) || (this.resultReason != null && !this.resultReason.equals(other.resultReason))) {
+            return false;
+        }
+        if ((this.sessionId == null && other.sessionId != null) || (this.sessionId != null && !this.sessionId.equals(other.sessionId))) {
+            return false;
+        }
+        if ((this.eventTime == null && other.eventTime != null) || (this.eventTime != null && !this.eventTime.equals(other.eventTime))) {
+            return false;
+        }
+        if ((this.requestUser == null && other.requestUser != null) || (this.requestUser != null && !this.requestUser.equals(other.requestUser))) {
+            return false;
+        }
+        if ((this.action == null && other.action != null) || (this.action != null && !this.action.equals(other.action))) {
+            return false;
+        }
+        if ((this.requestData == null && other.requestData != null) || (this.requestData != null && !this.requestData.equals(other.requestData))) {
+            return false;
+        }
+        if ((this.resourcePath == null && other.resourcePath != null) || (this.resourcePath != null && !this.resourcePath.equals(other.resourcePath))) {
+            return false;
+        }
+        return (this.resourceType != null || other.resourceType == null) && (this.resourceType == null || this.resourceType.equals(other.resourceType));
+    }
+
+    /**
+     * This return the bean content in string format
+     * @return formatedStr
+     */
+    @Override
+    public String toString() {
+        String str = "XXAccessAudit=";
+        str += super.toString();
+        str += "id={" + id + "} ";
+        str += "auditType={" + auditType + "} ";
+        str += "accessResult={" + accessResult + "} ";
+        str += "accessType={" + accessType + "} ";
+        str += "aclEnforcer={" + aclEnforcer + "} ";
+        str += "agentId={" + agentId + "} ";
+        str += "clientIP={" + clientIP + "} ";
+        str += "clientType={" + clientType + "} ";
+        str += "policyId={" + policyId + "} ";
+        str += "repoName={" + repoName + "} ";
+        str += "repoType={" + repoType + "} ";
+        str += "resultReason={" + resultReason + "} ";
+        str += "eventTime={" + eventTime + "} ";
+        str += "requestUser={" + requestUser + "} ";
+        str += "action={" + action + "} ";
+        str += "requestData={" + requestData + "} ";
+        str += "resourcePath={" + resourcePath + "} ";
+        str += "resourceType={" + resourceType + "} ";
+        return str;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>auditType</b>
+     * @return int - value of member attribute <b>auditType</b>.
+     */
+    public int getAuditType() {
+        return this.auditType;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b>auditType</b>.
+     * You cannot set null to the attribute.
+     * @param auditType Value to set member attribute <b>auditType</b>
+     */
+    public void setAuditType(int auditType) {
+        this.auditType = auditType;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>accessResult</b>
+     * @return int - value of member attribute <b>accessResult</b>.
+     */
+    public int getAccessResult() {
+        return this.accessResult;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b>accessResult</b>.
+     * You cannot set null to the attribute.
+     * @param accessResult Value to set member attribute <b>accessResult</b>
+     */
+    public void setAccessResult(int accessResult) {
+        this.accessResult = accessResult;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>accessType</b>
+     * @return String - value of member attribute <b>accessType</b>.
+     */
+    public String getAccessType() {
+        return this.accessType;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b>accessType</b>.
+     * You cannot set null to the attribute.
+     * @param accessType Value to set member attribute <b>accessType</b>
+     */
+    public void setAccessType(String accessType) {
+        this.accessType = accessType;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>aclEnforcer</b>
+     * @return String - value of member attribute <b>aclEnforcer</b>.
+     */
+    public String getAclEnforcer() {
+        return this.aclEnforcer;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b>aclEnforcer</b>.
+     * You cannot set null to the attribute.
+     * @param aclEnforcer Value to set member attribute <b>aclEnforcer</b>
+     */
+    public void setAclEnforcer(String aclEnforcer) {
+        this.aclEnforcer = aclEnforcer;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>agentId</b>
+     * @return String - value of member attribute <b>agentId</b>.
+     */
+    public String getAgentId() {
+        return this.agentId;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b>agentId</b>.
+     * You cannot set null to the attribute.
+     * @param agentId Value to set member attribute <b>agentId</b>
+     */
+    public void setAgentId(String agentId) {
+        this.agentId = agentId;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>clientIP</b>
+     * @return String - value of member attribute <b>clientIP</b>.
+     */
+    public String getClientIP() {
+        return this.clientIP;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b>clientIP</b>.
+     * You cannot set null to the attribute.
+     * @param clientIP Value to set member attribute <b>clientIP</b>
+     */
+    public void setClientIP(String clientIP) {
+        this.clientIP = clientIP;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>clientType</b>
+     * @return String - value of member attribute <b>clientType</b>.
+     */
+    public String getClientType() {
+        return this.clientType;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b>clientType</b>.
+     * You cannot set null to the attribute.
+     * @param clientType Value to set member attribute <b>clientType</b>
+     */
+    public void setClientType(String clientType) {
+        this.clientType = clientType;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>policyId</b>
+     * @return long - value of member attribute <b>policyId</b>.
+     */
+    public long getPolicyId() {
+        return this.policyId;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b>policyId</b>.
+     * You cannot set null to the attribute.
+     * @param policyId Value to set member attribute <b>policyId</b>
+     */
+    public void setPolicyId(long policyId) {
+        this.policyId = policyId;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>repoName</b>
+     * @return String - value of member attribute <b>repoName</b>.
+     */
+    public String getRepoName() {
+        return this.repoName;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b>repoName</b>.
+     * You cannot set null to the attribute.
+     * @param repoName Value to set member attribute <b>repoName</b>
+     */
+    public void setRepoName(String repoName) {
+        this.repoName = repoName;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>repoType</b>
+     * @return int - value of member attribute <b>repoType</b>.
+     */
+    public int getRepoType() {
+        return this.repoType;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b>repoType</b>.
+     * You cannot set null to the attribute.
+     * @param repoType Value to set member attribute <b>repoType</b>
+     */
+    public void setRepoType(int repoType) {
+        this.repoType = repoType;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>resultReason</b>
+     * @return String - value of member attribute <b>resultReason</b>.
+     */
+    public String getResultReason() {
+        return this.resultReason;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b>resultReason</b>.
+     * You cannot set null to the attribute.
+     * @param resultReason Value to set member attribute <b>resultReason</b>
+     */
+    public void setResultReason(String resultReason) {
+        this.resultReason = resultReason;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>sessionId</b>
+     * @return String - value of member attribute <b>sessionId</b>.
+     */
+    public String getSessionId() {
+        return this.sessionId;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b>sessionId</b>.
+     * You cannot set null to the attribute.
+     * @param sessionId Value to set member attribute <b>sessionId</b>
+     */
+    public void setSessionId(String sessionId) {
+        this.sessionId = sessionId;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>eventTime</b>
+     * @return Date - value of member attribute <b>eventTime</b>.
+     */
+    public Date getEventTime() {
+        return this.eventTime;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b>eventTime</b>.
+     * You cannot set null to the attribute.
+     * @param eventTime Value to set member attribute <b>eventTime</b>
+     */
+    public void setEventTime(Date eventTime) {
+        this.eventTime = eventTime;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>requestUser</b>
+     * @return String - value of member attribute <b>requestUser</b>.
+     */
+    public String getRequestUser() {
+        return this.requestUser;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b>requestUser</b>.
+     * You cannot set null to the attribute.
+     * @param requestUser Value to set member attribute <b>requestUser</b>
+     */
+    public void setRequestUser(String requestUser) {
+        this.requestUser = requestUser;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>action</b>
+     * @return String - value of member attribute <b>action</b>.
+     */
+    public String getAction() {
+        return this.action;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b>action</b>.
+     * You cannot set null to the attribute.
+     * @param action Value to set member attribute <b>action</b>
+     */
+    public void setAction(String action) {
+        this.action = action;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>requestData</b>
+     * @return String - value of member attribute <b>requestData</b>.
+     */
+    public String getRequestData() {
+        return this.requestData;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b>requestData</b>.
+     * You cannot set null to the attribute.
+     * @param requestData Value to set member attribute <b>requestData</b>
+     */
+    public void setRequestData(String requestData) {
+        this.requestData = requestData;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>resourcePath</b>
+     * @return String - value of member attribute <b>resourcePath</b>.
+     */
+    public String getResourcePath() {
+        return this.resourcePath;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b>resourcePath</b>.
+     * You cannot set null to the attribute.
+     * @param resourcePath Value to set member attribute <b>resourcePath</b>
+     */
+    public void setResourcePath(String resourcePath) {
+        this.resourcePath = resourcePath;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>resourceType</b>
+     * @return String - value of member attribute <b>resourceType</b>.
+     */
+    public String getResourceType() {
+        return this.resourceType;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b>resourceType</b>.
+     * You cannot set null to the attribute.
+     * @param resourceType Value to set member attribute <b>resourceType</b>
+     */
+    public void setResourceType(String resourceType) {
+        this.resourceType = resourceType;
+    }
 }
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXAccessAuditV4.java b/security-admin/src/main/java/org/apache/ranger/entity/XXAccessAuditV4.java
index d6aee1c0c..9728f894f 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXAccessAuditV4.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXAccessAuditV4.java
@@ -19,19 +19,18 @@
 
 package org.apache.ranger.entity;
 
+import org.apache.ranger.common.AppConstants;
+
 import javax.persistence.Entity;
 import javax.persistence.Table;
 
-import org.apache.ranger.common.AppConstants;
-
 @Entity
 @Table(name = "xa_access_audit")
 public class XXAccessAuditV4 extends XXAccessAuditBase implements java.io.Serializable {
-	private static final long serialVersionUID = 1L;
-
-	@Override
-	public int getMyClassType() {
-		return AppConstants.CLASS_TYPE_XA_ACCESS_AUDIT_V4;
-	}
+    private static final long serialVersionUID = 1L;
 
+    @Override
+    public int getMyClassType() {
+        return AppConstants.CLASS_TYPE_XA_ACCESS_AUDIT_V4;
+    }
 }
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXAccessAuditV5.java b/security-admin/src/main/java/org/apache/ranger/entity/XXAccessAuditV5.java
index b82bc0515..7ecf24e91 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXAccessAuditV5.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXAccessAuditV5.java
@@ -17,68 +17,69 @@
  * under the License.
  */
 
- package org.apache.ranger.entity;
+package org.apache.ranger.entity;
 
 /**
  * Access Audit
- *
  */
 
+import org.apache.ranger.common.AppConstants;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 
-import org.apache.ranger.common.AppConstants;
-
 @Entity
 @Table(name = "xa_access_audit")
 public class XXAccessAuditV5 extends XXAccessAuditBase implements java.io.Serializable {
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
+    @Column(name = "SEQ_NUM")
+    protected long sequenceNumber;
+    @Column(name = "EVENT_COUNT")
+    protected long eventCount;
+    //event duration in ms
+    @Column(name = "EVENT_DUR_MS")
+    protected long eventDuration;
+
+    @Override
+    public int getMyClassType() {
+        return AppConstants.CLASS_TYPE_XA_ACCESS_AUDIT_V5;
+    }
+
+    /**
+     * This return the bean content in string format
+     * @return formatedStr
+     */
+    @Override
+    public String toString() {
+        String str = super.toString();
+        str += "sequenceNumber={" + sequenceNumber + "}";
+        str += "eventCount={" + eventCount + "}";
+        str += "eventDuration={" + eventDuration + "}";
+        return str;
+    }
 
-	@Override
-	public int getMyClassType() {
-		return AppConstants.CLASS_TYPE_XA_ACCESS_AUDIT_V5;
-	}
+    public long getSequenceNumber() {
+        return sequenceNumber;
+    }
 
-	@Column(name="SEQ_NUM")
-	protected long sequenceNumber;
+    public void setSequenceNumber(long sequenceNumber) {
+        this.sequenceNumber = sequenceNumber;
+    }
 
-	@Column(name="EVENT_COUNT")
-	protected long eventCount;
+    public long getEventCount() {
+        return eventCount;
+    }
 
-	//event duration in ms
-	@Column(name="EVENT_DUR_MS")
-	protected long eventDuration;
+    public void setEventCount(long eventCount) {
+        this.eventCount = eventCount;
+    }
 
-	public long getSequenceNumber() {
-		return sequenceNumber;
-	}
-	public void setSequenceNumber(long sequenceNumber) {
-		this.sequenceNumber = sequenceNumber;
-	}
-	public long getEventCount() {
-		return eventCount;
-	}
-	public void setEventCount(long eventCount) {
-		this.eventCount = eventCount;
-	}
-	public long getEventDuration() {
-		return eventDuration;
-	}
-	public void setEventDuration(long eventDuration) {
-		this.eventDuration = eventDuration;
-	}
+    public long getEventDuration() {
+        return eventDuration;
+    }
 
-	/**
-	 * This return the bean content in string format
-	 * @return formatedStr
-	*/
-	@Override
-	public String toString( ) {
-		String str = super.toString();
-		str += "sequenceNumber={" + sequenceNumber + "}";
-		str += "eventCount={" + eventCount + "}";
-		str += "eventDuration={" + eventDuration + "}";
-		return str;
-	}
+    public void setEventDuration(long eventDuration) {
+        this.eventDuration = eventDuration;
+    }
 }
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXAccessTypeDef.java b/security-admin/src/main/java/org/apache/ranger/entity/XXAccessTypeDef.java
index 846479d89..90aeb2925 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXAccessTypeDef.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXAccessTypeDef.java
@@ -18,304 +18,295 @@
  */
 package org.apache.ranger.entity;
 
-import javax.persistence.*;
+import javax.persistence.Cacheable;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+
 import java.util.Objects;
 
 @Entity
 @Cacheable
 @Table(name = "x_access_type_def")
 public class XXAccessTypeDef extends XXDBBase implements java.io.Serializable {
-	private static final long serialVersionUID = 1L;
-	/**
-	 * id of the XXAccessTypeDef
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Id
-	@SequenceGenerator(name = "x_access_type_def_SEQ", sequenceName = "x_access_type_def_SEQ", allocationSize = 1)
-	@GeneratedValue(strategy = GenerationType.AUTO, generator = "x_access_type_def_SEQ")
-	@Column(name = "id")
-	protected Long id;
-
-	/**
-	 * defId of the XXAccessTypeDef
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Column(name = "def_id")
-	protected Long defId;
-
-	/**
-	 * itemId of the XXAccessTypeDef
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Column(name = "item_id")
-	protected Long itemId;
-
-	/**
-	 * name of the XXAccessTypeDef
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Column(name = "name")
-	protected String name;
-
-	/**
-	 * label of the XXAccessTypeDef
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Column(name = "label")
-	protected String label;
-
-	/**
-	 * rbKeyLabel of the XXAccessTypeDef
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Column(name = "rb_key_label")
-	protected String rbKeyLabel;
-
-	/**
-	 * category of the XXAccessTypeDef
-	 */
-	@Column(name = "category")
-	protected Short category;
-
-	/**
-	 * order of the XXAccessTypeDef
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Column(name = "sort_order")
-	protected Integer order;
-
-	/**
-	 * dataMaskOptions of the XXAccessTypeDef
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Column(name = "datamask_options")
-	protected String dataMaskOptions;
-
-	/**
-	 * rowFilterOptions of the XXAccessTypeDef
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Column(name = "rowfilter_options")
-	protected String rowFilterOptions;
-
-	/**
-	 * This method sets the value to the member attribute <b> id</b> . You
-	 * cannot set null to the attribute.
-	 *
-	 * @param id
-	 *            Value to set member attribute <b> id</b>
-	 */
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>id</b>
-	 *
-	 * @return Date - value of member attribute <b>id</b> .
-	 */
-	public Long getId() {
-		return this.id;
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b> defId</b> . You
-	 * cannot set null to the attribute.
-	 *
-	 * @param defId
-	 *            Value to set member attribute <b> defId</b>
-	 */
-	public void setDefid(Long defId) {
-		this.defId = defId;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>defId</b>
-	 *
-	 * @return Date - value of member attribute <b>defId</b> .
-	 */
-	public Long getDefid() {
-		return this.defId;
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b> itemId</b> . You
-	 * cannot set null to the attribute.
-	 *
-	 * @param itemId
-	 *            Value to set member attribute <b> itemId</b>
-	 */
-	public void setItemId(Long itemId) {
-		this.itemId = itemId;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>itemId</b>
-	 *
-	 * @return Long - value of member attribute <b>itemId</b> .
-	 */
-	public Long getItemId() {
-		return this.itemId;
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b> name</b> . You
-	 * cannot set null to the attribute.
-	 *
-	 * @param name
-	 *            Value to set member attribute <b> name</b>
-	 */
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>name</b>
-	 *
-	 * @return Date - value of member attribute <b>name</b> .
-	 */
-	public String getName() {
-		return this.name;
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b> label</b> . You
-	 * cannot set null to the attribute.
-	 *
-	 * @param label
-	 *            Value to set member attribute <b> label</b>
-	 */
-	public void setLabel(String label) {
-		this.label = label;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>label</b>
-	 *
-	 * @return Date - value of member attribute <b>label</b> .
-	 */
-	public String getLabel() {
-		return this.label;
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b> rbKeyLabel</b> .
-	 * You cannot set null to the attribute.
-	 *
-	 * @param rbKeyLabel
-	 *            Value to set member attribute <b> rbKeyLabel</b>
-	 */
-	public void setRbkeylabel(String rbKeyLabel) {
-		this.rbKeyLabel = rbKeyLabel;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>rbKeyLabel</b>
-	 *
-	 * @return Date - value of member attribute <b>rbKeyLabel</b> .
-	 */
-	public String getRbkeylabel() {
-		return this.rbKeyLabel;
-	}
-
-	public Short getCategory() {
-		return category;
-	}
-
-	public void setCategory(Short category) {
-		this.category = category;
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b> order</b> . You
-	 * cannot set null to the attribute.
-	 *
-	 * @param order
-	 *            Value to set member attribute <b> order</b>
-	 */
-	public void setOrder(Integer order) {
-		this.order = order;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>order</b>
-	 *
-	 * @return Date - value of member attribute <b>order</b> .
-	 */
-	public Integer getOrder() {
-		return this.order;
-	}
-
-	public String getDataMaskOptions() {
-		return dataMaskOptions;
-	}
-
-	public void setDataMaskOptions(String dataMaskOptions) {
-		this.dataMaskOptions = dataMaskOptions;
-	}
-
-	public String getRowFilterOptions() { return rowFilterOptions; }
-
-	public void setRowFilterOptions(String rowFilterOptions) { this.rowFilterOptions = rowFilterOptions; }
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj) {
-			return true;
-		} else if (getClass() != obj.getClass()) {
-			return false;
-		} else if (!super.equals(obj)) {
-			return false;
-		}
-
-		XXAccessTypeDef other = (XXAccessTypeDef) obj;
-
-		return Objects.equals(defId, other.defId) &&
-		       Objects.equals(itemId, other.itemId) &&
-		       Objects.equals(id, other.id) &&
-		       Objects.equals(name, other.name) &&
-		       Objects.equals(label, other.label) &&
-		       Objects.equals(rbKeyLabel, other.rbKeyLabel) &&
-		       Objects.equals(category, other.category) &&
-		       Objects.equals(dataMaskOptions, other.dataMaskOptions) &&
-		       Objects.equals(rowFilterOptions, other.rowFilterOptions) &&
-		       Objects.equals(order, other.order);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see java.lang.Object#toString()
-	 */
-	@Override
-	public String toString() {
-		return "XXAccessTypeDef [" + super.toString() + " id=" + id
-				+ ", defId=" + defId + ", itemId=" + itemId + ", name=" + name + ", label=" + label
-				+ ", rbKeyLabel=" + rbKeyLabel + ", category=" + category + ", dataMaskOptions=" + dataMaskOptions
-				+ ", rowFilterOptions=" + rowFilterOptions + ", order=" + order + "]";
-	}
-
+    private static final long serialVersionUID = 1L;
+    /**
+     * id of the XXAccessTypeDef
+     * <ul>
+     * </ul>
+     */
+    @Id
+    @SequenceGenerator(name = "x_access_type_def_SEQ", sequenceName = "x_access_type_def_SEQ", allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.AUTO, generator = "x_access_type_def_SEQ")
+    @Column(name = "id")
+    protected            Long id;
+
+    /**
+     * defId of the XXAccessTypeDef
+     * <ul>
+     * </ul>
+     */
+    @Column(name = "def_id")
+    protected Long defId;
+
+    /**
+     * itemId of the XXAccessTypeDef
+     * <ul>
+     * </ul>
+     */
+    @Column(name = "item_id")
+    protected Long itemId;
+
+    /**
+     * name of the XXAccessTypeDef
+     * <ul>
+     * </ul>
+     */
+    @Column(name = "name")
+    protected String name;
+
+    /**
+     * label of the XXAccessTypeDef
+     * <ul>
+     * </ul>
+     */
+    @Column(name = "label")
+    protected String label;
+
+    /**
+     * rbKeyLabel of the XXAccessTypeDef
+     * <ul>
+     * </ul>
+     */
+    @Column(name = "rb_key_label")
+    protected String rbKeyLabel;
+
+    /**
+     * category of the XXAccessTypeDef
+     */
+    @Column(name = "category")
+    protected Short category;
+
+    /**
+     * order of the XXAccessTypeDef
+     * <ul>
+     * </ul>
+     */
+    @Column(name = "sort_order")
+    protected Integer order;
+
+    /**
+     * dataMaskOptions of the XXAccessTypeDef
+     * <ul>
+     * </ul>
+     */
+    @Column(name = "datamask_options")
+    protected String dataMaskOptions;
+
+    /**
+     * rowFilterOptions of the XXAccessTypeDef
+     * <ul>
+     * </ul>
+     */
+    @Column(name = "rowfilter_options")
+    protected String rowFilterOptions;
+
+    /**
+     * Returns the value for the member attribute <b>id</b>
+     *
+     * @return Date - value of member attribute <b>id</b> .
+     */
+    public Long getId() {
+        return this.id;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b> id</b> . You
+     * cannot set null to the attribute.
+     *
+     * @param id Value to set member attribute <b> id</b>
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see java.lang.Object#equals(java.lang.Object)
+     */
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        } else if (getClass() != obj.getClass()) {
+            return false;
+        } else if (!super.equals(obj)) {
+            return false;
+        }
+
+        XXAccessTypeDef other = (XXAccessTypeDef) obj;
+
+        return Objects.equals(defId, other.defId) &&
+                Objects.equals(itemId, other.itemId) &&
+                Objects.equals(id, other.id) &&
+                Objects.equals(name, other.name) &&
+                Objects.equals(label, other.label) &&
+                Objects.equals(rbKeyLabel, other.rbKeyLabel) &&
+                Objects.equals(category, other.category) &&
+                Objects.equals(dataMaskOptions, other.dataMaskOptions) &&
+                Objects.equals(rowFilterOptions, other.rowFilterOptions) &&
+                Objects.equals(order, other.order);
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        return "XXAccessTypeDef [" + super.toString() + " id=" + id
+                + ", defId=" + defId + ", itemId=" + itemId + ", name=" + name + ", label=" + label
+                + ", rbKeyLabel=" + rbKeyLabel + ", category=" + category + ", dataMaskOptions=" + dataMaskOptions
+                + ", rowFilterOptions=" + rowFilterOptions + ", order=" + order + "]";
+    }
+
+    /**
+     * Returns the value for the member attribute <b>defId</b>
+     *
+     * @return Date - value of member attribute <b>defId</b> .
+     */
+    public Long getDefid() {
+        return this.defId;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b> defId</b> . You
+     * cannot set null to the attribute.
+     *
+     * @param defId Value to set member attribute <b> defId</b>
+     */
+    public void setDefid(Long defId) {
+        this.defId = defId;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>itemId</b>
+     *
+     * @return Long - value of member attribute <b>itemId</b> .
+     */
+    public Long getItemId() {
+        return this.itemId;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b> itemId</b> . You
+     * cannot set null to the attribute.
+     *
+     * @param itemId Value to set member attribute <b> itemId</b>
+     */
+    public void setItemId(Long itemId) {
+        this.itemId = itemId;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>name</b>
+     *
+     * @return Date - value of member attribute <b>name</b> .
+     */
+    public String getName() {
+        return this.name;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b> name</b> . You
+     * cannot set null to the attribute.
+     *
+     * @param name Value to set member attribute <b> name</b>
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>label</b>
+     *
+     * @return Date - value of member attribute <b>label</b> .
+     */
+    public String getLabel() {
+        return this.label;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b> label</b> . You
+     * cannot set null to the attribute.
+     *
+     * @param label Value to set member attribute <b> label</b>
+     */
+    public void setLabel(String label) {
+        this.label = label;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>rbKeyLabel</b>
+     *
+     * @return Date - value of member attribute <b>rbKeyLabel</b> .
+     */
+    public String getRbkeylabel() {
+        return this.rbKeyLabel;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b> rbKeyLabel</b> .
+     * You cannot set null to the attribute.
+     *
+     * @param rbKeyLabel Value to set member attribute <b> rbKeyLabel</b>
+     */
+    public void setRbkeylabel(String rbKeyLabel) {
+        this.rbKeyLabel = rbKeyLabel;
+    }
+
+    public Short getCategory() {
+        return category;
+    }
+
+    public void setCategory(Short category) {
+        this.category = category;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>order</b>
+     *
+     * @return Date - value of member attribute <b>order</b> .
+     */
+    public Integer getOrder() {
+        return this.order;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b> order</b> . You
+     * cannot set null to the attribute.
+     *
+     * @param order Value to set member attribute <b> order</b>
+     */
+    public void setOrder(Integer order) {
+        this.order = order;
+    }
+
+    public String getDataMaskOptions() {
+        return dataMaskOptions;
+    }
+
+    public void setDataMaskOptions(String dataMaskOptions) {
+        this.dataMaskOptions = dataMaskOptions;
+    }
+
+    public String getRowFilterOptions()                      {return rowFilterOptions;}
+
+    public void setRowFilterOptions(String rowFilterOptions) {this.rowFilterOptions = rowFilterOptions;}
 }
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXAccessTypeDefGrants.java b/security-admin/src/main/java/org/apache/ranger/entity/XXAccessTypeDefGrants.java
index 4024a5057..aa88b05b5 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXAccessTypeDefGrants.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXAccessTypeDefGrants.java
@@ -18,157 +18,153 @@
  */
 package org.apache.ranger.entity;
 
-import javax.persistence.*;
+import javax.persistence.Cacheable;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
 
 @Entity
 @Cacheable
 @Table(name = "x_access_type_def_grants")
 public class XXAccessTypeDefGrants extends XXDBBase implements
-		java.io.Serializable {
-	private static final long serialVersionUID = 1L;
-	/**
-	 * id of the XXAccessTypeDefGrants
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Id
-	@SequenceGenerator(name = "x_access_type_def_grants_SEQ", sequenceName = "x_access_type_def_grants_SEQ", allocationSize = 1)
-	@GeneratedValue(strategy = GenerationType.AUTO, generator = "x_access_type_def_grants_SEQ")
-	@Column(name = "id")
-	protected Long id;
+        java.io.Serializable {
+    private static final long serialVersionUID = 1L;
+    /**
+     * id of the XXAccessTypeDefGrants
+     * <ul>
+     * </ul>
+     */
+    @Id
+    @SequenceGenerator(name = "x_access_type_def_grants_SEQ", sequenceName = "x_access_type_def_grants_SEQ", allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.AUTO, generator = "x_access_type_def_grants_SEQ")
+    @Column(name = "id")
+    protected            Long id;
 
-	/**
-	 * atdId of the XXAccessTypeDefGrants
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Column(name = "atd_id")
-	protected Long atdId;
+    /**
+     * atdId of the XXAccessTypeDefGrants
+     * <ul>
+     * </ul>
+     */
+    @Column(name = "atd_id")
+    protected Long atdId;
 
-	/**
-	 * impliedGrant of the XXAccessTypeDefGrants
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Column(name = "implied_grant")
-	protected String impliedGrant;
+    /**
+     * impliedGrant of the XXAccessTypeDefGrants
+     * <ul>
+     * </ul>
+     */
+    @Column(name = "implied_grant")
+    protected String impliedGrant;
 
-	/**
-	 * This method sets the value to the member attribute <b> id</b> . You
-	 * cannot set null to the attribute.
-	 *
-	 * @param id
-	 *            Value to set member attribute <b> id</b>
-	 */
-	public void setId(Long id) {
-		this.id = id;
-	}
+    /**
+     * Returns the value for the member attribute <b>id</b>
+     *
+     * @return Date - value of member attribute <b>id</b> .
+     */
+    public Long getId() {
+        return this.id;
+    }
 
-	/**
-	 * Returns the value for the member attribute <b>id</b>
-	 *
-	 * @return Date - value of member attribute <b>id</b> .
-	 */
-	public Long getId() {
-		return this.id;
-	}
+    /**
+     * This method sets the value to the member attribute <b> id</b> . You
+     * cannot set null to the attribute.
+     *
+     * @param id Value to set member attribute <b> id</b>
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
 
-	/**
-	 * This method sets the value to the member attribute <b> atdId</b> . You
-	 * cannot set null to the attribute.
-	 *
-	 * @param atdId
-	 *            Value to set member attribute <b> atdId</b>
-	 */
-	public void setAtdId(Long atdId) {
-		this.atdId = atdId;
-	}
+    /*
+     * (non-Javadoc)
+     *
+     * @see java.lang.Object#equals(java.lang.Object)
+     */
+    @Override
+    public boolean equals(Object obj) {
+        if (!super.equals(obj)) {
+            return false;
+        }
+        if (this == obj) {
+            return true;
+        }
+        if (!super.equals(obj)) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        XXAccessTypeDefGrants other = (XXAccessTypeDefGrants) obj;
+        if (atdId == null) {
+            if (other.atdId != null) {
+                return false;
+            }
+        } else if (!atdId.equals(other.atdId)) {
+            return false;
+        }
+        if (id == null) {
+            if (other.id != null) {
+                return false;
+            }
+        } else if (!id.equals(other.id)) {
+            return false;
+        }
+        if (impliedGrant == null) {
+            return other.impliedGrant == null;
+        } else
+            return impliedGrant.equals(other.impliedGrant);
+    }
 
-	/**
-	 * Returns the value for the member attribute <b>atdId</b>
-	 *
-	 * @return Date - value of member attribute <b>atdId</b> .
-	 */
-	public Long getAtdId() {
-		return this.atdId;
-	}
+    /*
+     * (non-Javadoc)
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        return "XXAccessTypeDefGrants [" + super.toString() + " id=" + id
+                + ", atdId=" + atdId + ", impliedGrant=" + impliedGrant + "]";
+    }
 
-	/**
-	 * This method sets the value to the member attribute <b> impliedGrant</b> .
-	 * You cannot set null to the attribute.
-	 *
-	 * @param impliedGrant
-	 *            Value to set member attribute <b> impliedGrant</b>
-	 */
-	public void setImpliedGrant(String impliedGrant) {
-		this.impliedGrant = impliedGrant;
-	}
+    /**
+     * Returns the value for the member attribute <b>atdId</b>
+     *
+     * @return Date - value of member attribute <b>atdId</b> .
+     */
+    public Long getAtdId() {
+        return this.atdId;
+    }
 
-	/**
-	 * Returns the value for the member attribute <b>impliedGrant</b>
-	 *
-	 * @return Date - value of member attribute <b>impliedGrant</b> .
-	 */
-	public String getImpliedGrant() {
-		return this.impliedGrant;
-	}
+    /**
+     * This method sets the value to the member attribute <b> atdId</b> . You
+     * cannot set null to the attribute.
+     *
+     * @param atdId Value to set member attribute <b> atdId</b>
+     */
+    public void setAtdId(Long atdId) {
+        this.atdId = atdId;
+    }
 
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	@Override
-	public boolean equals(Object obj) {
-		if (!super.equals(obj)) {
-			return false;
-		}
-		if (this == obj) {
-			return true;
-		}
-		if (!super.equals(obj)) {
-			return false;
-		}
-		if (getClass() != obj.getClass()) {
-			return false;
-		}
-		XXAccessTypeDefGrants other = (XXAccessTypeDefGrants) obj;
-		if (atdId == null) {
-			if (other.atdId != null) {
-				return false;
-			}
-		} else if (!atdId.equals(other.atdId)) {
-			return false;
-		}
-		if (id == null) {
-			if (other.id != null) {
-				return false;
-			}
-		} else if (!id.equals(other.id)) {
-			return false;
-		}
-		if (impliedGrant == null) {
-			if (other.impliedGrant != null) {
-				return false;
-			}
-		} else if (!impliedGrant.equals(other.impliedGrant)) {
-			return false;
-		}
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see java.lang.Object#toString()
-	 */
-	@Override
-	public String toString() {
-		return "XXAccessTypeDefGrants [" + super.toString() + " id=" + id
-				+ ", atdId=" + atdId + ", impliedGrant=" + impliedGrant + "]";
-	}
+    /**
+     * Returns the value for the member attribute <b>impliedGrant</b>
+     *
+     * @return Date - value of member attribute <b>impliedGrant</b> .
+     */
+    public String getImpliedGrant() {
+        return this.impliedGrant;
+    }
 
+    /**
+     * This method sets the value to the member attribute <b> impliedGrant</b> .
+     * You cannot set null to the attribute.
+     *
+     * @param impliedGrant Value to set member attribute <b> impliedGrant</b>
+     */
+    public void setImpliedGrant(String impliedGrant) {
+        this.impliedGrant = impliedGrant;
+    }
 }
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXAsset.java b/security-admin/src/main/java/org/apache/ranger/entity/XXAsset.java
index 9683db038..55e9449e6 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXAsset.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXAsset.java
@@ -17,13 +17,15 @@
  * under the License.
  */
 
- package org.apache.ranger.entity;
+package org.apache.ranger.entity;
 
 /**
  * Asset
- *
  */
 
+import org.apache.ranger.common.AppConstants;
+import org.apache.ranger.common.RangerConstants;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -32,260 +34,255 @@ import javax.persistence.Id;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 
-import org.apache.ranger.common.AppConstants;
-import org.apache.ranger.common.RangerConstants;
-
-
 @Entity
-@Table(name="x_asset")
+@Table(name = "x_asset")
 public class XXAsset extends XXDBBase implements java.io.Serializable {
-	private static final long serialVersionUID = 1L;
-
-	@Id
-	@SequenceGenerator(name="X_ASSET_SEQ",sequenceName="X_ASSET_SEQ",allocationSize=1)
-	@GeneratedValue(strategy=GenerationType.AUTO,generator="X_ASSET_SEQ")
-	@Column(name="ID")
-	protected Long id;
-
-	@Override
-	public void setId(Long id) {
-		this.id=id;
-	}
-	@Override
-	public Long getId() {
-		return id;
-	}
-	/**
-	 * Name
-	 * <ul>
-	 * <li>The maximum length for this attribute is <b>1024</b>.
-	 * </ul>
-	 *
-	 */
-	@Column(name="ASSET_NAME"  , nullable=false , length=1024)
-	protected String name;
+    private static final long serialVersionUID = 1L;
 
-	/**
-	 * Description
-	 * <ul>
-	 * <li>The maximum length for this attribute is <b>4000</b>.
-	 * </ul>
-	 *
-	 */
-	@Column(name="DESCR"  , nullable=false , length=4000)
-	protected String description;
+    @Id
+    @SequenceGenerator(name = "X_ASSET_SEQ", sequenceName = "X_ASSET_SEQ", allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.AUTO, generator = "X_ASSET_SEQ")
+    @Column(name = "ID")
+    protected Long id;
+    /**
+     * Name
+     * <ul>
+     * <li>The maximum length for this attribute is <b>1024</b>.
+     * </ul>
+     *
+     */
+    @Column(name = "ASSET_NAME", nullable = false, length = 1024)
+    protected String name;    @Override
+    public void setId(Long id) {
+        this.id = id;
+    }
+    /**
+     * Description
+     * <ul>
+     * <li>The maximum length for this attribute is <b>4000</b>.
+     * </ul>
+     *
+     */
+    @Column(name = "DESCR", nullable = false, length = 4000)
+    protected String description;    @Override
+    public Long getId() {
+        return id;
+    }
+    /**
+     * Status
+     * <ul>
+     * <li>This attribute is of type enum CommonEnums::ActiveStatus
+     * </ul>
+     *
+     */
+    @Column(name = "ACT_STATUS", nullable = false)
+    protected int activeStatus = RangerConstants.STATUS_DISABLED;
+    /**
+     * Type of asset
+     * <ul>
+     * <li>This attribute is of type enum CommonEnums::AssetType
+     * </ul>
+     *
+     */
+    @Column(name = "ASSET_TYPE", nullable = false)
+    protected int assetType = AppConstants.ASSET_UNKNOWN;
+    /**
+     * Config in json format
+     * <ul>
+     * <li>The maximum length for this attribute is <b>10000</b>.
+     * </ul>
+     *
+     */
+    @Column(name = "CONFIG", length = 10000)
+    protected String config;
+    /**
+     * Support native authorization
+     * <ul>
+     * </ul>
+     *
+     */
+    @Column(name = "SUP_NATIVE", nullable = false)
+    protected boolean supportNative = false;
 
-	/**
-	 * Status
-	 * <ul>
-	 * <li>This attribute is of type enum CommonEnums::ActiveStatus
-	 * </ul>
-	 *
-	 */
-	@Column(name="ACT_STATUS"  , nullable=false )
-	protected int activeStatus = RangerConstants.STATUS_DISABLED;
+    /**
+     * Default constructor. This will set all the attributes to default value.
+     */
+    public XXAsset() {
+        activeStatus = RangerConstants.STATUS_DISABLED;
+        assetType    = AppConstants.ASSET_UNKNOWN;
+    }
 
-	/**
-	 * Type of asset
-	 * <ul>
-	 * <li>This attribute is of type enum CommonEnums::AssetType
-	 * </ul>
-	 *
-	 */
-	@Column(name="ASSET_TYPE"  , nullable=false )
-	protected int assetType = AppConstants.ASSET_UNKNOWN;
+    public static String getEnumName(String fieldName) {
+        if ("activeStatus".equals(fieldName)) {
+            return "CommonEnums.ActiveStatus";
+        }
+        if ("assetType".equals(fieldName)) {
+            return "CommonEnums.AssetType";
+        }
+        //Later TODO
+        //return super.getEnumName(fieldName);
+        return null;
+    }
 
-	/**
-	 * Config in json format
-	 * <ul>
-	 * <li>The maximum length for this attribute is <b>10000</b>.
-	 * </ul>
-	 *
-	 */
-	@Column(name="CONFIG"   , length=10000)
-	protected String config;
+    @Override
+    public int getMyClassType() {
+        return AppConstants.CLASS_TYPE_XA_ASSET;
+    }
 
-	/**
-	 * Support native authorization
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Column(name="SUP_NATIVE"  , nullable=false )
-	protected boolean supportNative = false;
+    @Override
+    public String getMyDisplayValue() {
+        return getDescription();
+    }
 
-	/**
-	 * Default constructor. This will set all the attributes to default value.
-	 */
-	public XXAsset ( ) {
-		activeStatus = RangerConstants.STATUS_DISABLED;
-		assetType = AppConstants.ASSET_UNKNOWN;
-	}
+    /**
+     * Returns the value for the member attribute <b>name</b>
+     * @return String - value of member attribute <b>name</b>.
+     */
+    public String getName() {
+        return this.name;
+    }
 
-	@Override
-	public int getMyClassType( ) {
-	    return AppConstants.CLASS_TYPE_XA_ASSET;
-	}
+    /**
+     * This method sets the value to the member attribute <b>name</b>.
+     * You cannot set null to the attribute.
+     * @param name Value to set member attribute <b>name</b>
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
 
-	@Override
-	public String getMyDisplayValue() {
-		return getDescription( );
-	}
+    /**
+     * Returns the value for the member attribute <b>description</b>
+     * @return String - value of member attribute <b>description</b>.
+     */
+    public String getDescription() {
+        return this.description;
+    }
 
-	/**
-	 * This method sets the value to the member attribute <b>name</b>.
-	 * You cannot set null to the attribute.
-	 * @param name Value to set member attribute <b>name</b>
-	 */
-	public void setName( String name ) {
-		this.name = name;
-	}
+    /**
+     * This method sets the value to the member attribute <b>description</b>.
+     * You cannot set null to the attribute.
+     * @param description Value to set member attribute <b>description</b>
+     */
+    public void setDescription(String description) {
+        this.description = description;
+    }
 
-	/**
-	 * Returns the value for the member attribute <b>name</b>
-	 * @return String - value of member attribute <b>name</b>.
-	 */
-	public String getName( ) {
-		return this.name;
-	}
+    /**
+     * Returns the value for the member attribute <b>activeStatus</b>
+     * @return int - value of member attribute <b>activeStatus</b>.
+     */
+    public int getActiveStatus() {
+        return this.activeStatus;
+    }
 
-	/**
-	 * This method sets the value to the member attribute <b>description</b>.
-	 * You cannot set null to the attribute.
-	 * @param description Value to set member attribute <b>description</b>
-	 */
-	public void setDescription( String description ) {
-		this.description = description;
-	}
+    /**
+     * This method sets the value to the member attribute <b>activeStatus</b>.
+     * You cannot set null to the attribute.
+     * @param activeStatus Value to set member attribute <b>activeStatus</b>
+     */
+    public void setActiveStatus(int activeStatus) {
+        this.activeStatus = activeStatus;
+    }
 
-	/**
-	 * Returns the value for the member attribute <b>description</b>
-	 * @return String - value of member attribute <b>description</b>.
-	 */
-	public String getDescription( ) {
-		return this.description;
-	}
+    /**
+     * Returns the value for the member attribute <b>assetType</b>
+     * @return int - value of member attribute <b>assetType</b>.
+     */
+    public int getAssetType() {
+        return this.assetType;
+    }
 
-	/**
-	 * This method sets the value to the member attribute <b>activeStatus</b>.
-	 * You cannot set null to the attribute.
-	 * @param activeStatus Value to set member attribute <b>activeStatus</b>
-	 */
-	public void setActiveStatus( int activeStatus ) {
-		this.activeStatus = activeStatus;
-	}
+    /**
+     * This method sets the value to the member attribute <b>assetType</b>.
+     * You cannot set null to the attribute.
+     * @param assetType Value to set member attribute <b>assetType</b>
+     */
+    public void setAssetType(int assetType) {
+        this.assetType = assetType;
+    }
 
-	/**
-	 * Returns the value for the member attribute <b>activeStatus</b>
-	 * @return int - value of member attribute <b>activeStatus</b>.
-	 */
-	public int getActiveStatus( ) {
-		return this.activeStatus;
-	}
+    /**
+     * Returns the value for the member attribute <b>config</b>
+     * @return String - value of member attribute <b>config</b>.
+     */
+    public String getConfig() {
+        return this.config;
+    }
 
-	/**
-	 * This method sets the value to the member attribute <b>assetType</b>.
-	 * You cannot set null to the attribute.
-	 * @param assetType Value to set member attribute <b>assetType</b>
-	 */
-	public void setAssetType( int assetType ) {
-		this.assetType = assetType;
-	}
+    /**
+     * This method sets the value to the member attribute <b>config</b>.
+     * You cannot set null to the attribute.
+     * @param config Value to set member attribute <b>config</b>
+     */
+    public void setConfig(String config) {
+        this.config = config;
+    }
 
-	/**
-	 * Returns the value for the member attribute <b>assetType</b>
-	 * @return int - value of member attribute <b>assetType</b>.
-	 */
-	public int getAssetType( ) {
-		return this.assetType;
-	}
+    /**
+     * Returns the value for the member attribute <b>supportNative</b>
+     * @return boolean - value of member attribute <b>supportNative</b>.
+     */
+    public boolean isSupportNative() {
+        return this.supportNative;
+    }
 
-	/**
-	 * This method sets the value to the member attribute <b>config</b>.
-	 * You cannot set null to the attribute.
-	 * @param config Value to set member attribute <b>config</b>
-	 */
-	public void setConfig( String config ) {
-		this.config = config;
-	}
+    /**
+     * This method sets the value to the member attribute <b>supportNative</b>.
+     * You cannot set null to the attribute.
+     * @param supportNative Value to set member attribute <b>supportNative</b>
+     */
+    public void setSupportNative(boolean supportNative) {
+        this.supportNative = supportNative;
+    }
 
-	/**
-	 * Returns the value for the member attribute <b>config</b>
-	 * @return String - value of member attribute <b>config</b>.
-	 */
-	public String getConfig( ) {
-		return this.config;
-	}
 
-	/**
-	 * This method sets the value to the member attribute <b>supportNative</b>.
-	 * You cannot set null to the attribute.
-	 * @param supportNative Value to set member attribute <b>supportNative</b>
-	 */
-	public void setSupportNative( boolean supportNative ) {
-		this.supportNative = supportNative;
-	}
 
-	/**
-	 * Returns the value for the member attribute <b>supportNative</b>
-	 * @return boolean - value of member attribute <b>supportNative</b>.
-	 */
-	public boolean isSupportNative( ) {
-		return this.supportNative;
-	}
+    /**
+     * This return the bean content in string format
+     * @return formatedStr
+     */
+    @Override
+    public String toString() {
+        String str = "XXAsset={";
+        str += super.toString();
+        str += "name={" + name + "} ";
+        str += "description={" + description + "} ";
+        str += "activeStatus={" + activeStatus + "} ";
+        str += "assetType={" + assetType + "} ";
+        str += "config={" + config + "} ";
+        str += "supportNative={" + supportNative + "} ";
+        str += "}";
+        return str;
+    }
 
-	/**
-	 * This return the bean content in string format
-	 * @return formatedStr
-	*/
-	@Override
-	public String toString( ) {
-		String str = "XXAsset={";
-		str += super.toString();
-		str += "name={" + name + "} ";
-		str += "description={" + description + "} ";
-		str += "activeStatus={" + activeStatus + "} ";
-		str += "assetType={" + assetType + "} ";
-		str += "config={" + config + "} ";
-		str += "supportNative={" + supportNative + "} ";
-		str += "}";
-		return str;
-	}
+    /**
+     * Checks for all attributes except referenced db objects
+     * @return true if all attributes match
+     */
+    @Override
+    public boolean equals(Object obj) {
+        if (!super.equals(obj)) {
+            return false;
+        }
+        XXAsset other = (XXAsset) obj;
+        if ((this.name == null && other.name != null) || (this.name != null && !this.name.equals(other.name))) {
+            return false;
+        }
+        if ((this.description == null && other.description != null) || (this.description != null && !this.description.equals(other.description))) {
+            return false;
+        }
+        if (this.activeStatus != other.activeStatus) {
+            return false;
+        }
+        if (this.assetType != other.assetType) {
+            return false;
+        }
+        if ((this.config == null && other.config != null) || (this.config != null && !this.config.equals(other.config))) {
+            return false;
+        }
+        return this.supportNative == other.supportNative;
+    }
 
-	/**
-	 * Checks for all attributes except referenced db objects
-	 * @return true if all attributes match
-	*/
-	@Override
-	public boolean equals( Object obj) {
-		if ( !super.equals(obj) ) {
-			return false;
-		}
-		XXAsset other = (XXAsset) obj;
-        	if ((this.name == null && other.name != null) || (this.name != null && !this.name.equals(other.name))) {
-            		return false;
-        	}
-        	if ((this.description == null && other.description != null) || (this.description != null && !this.description.equals(other.description))) {
-            		return false;
-        	}
-		if( this.activeStatus != other.activeStatus ) return false;
-		if( this.assetType != other.assetType ) return false;
-        	if ((this.config == null && other.config != null) || (this.config != null && !this.config.equals(other.config))) {
-            		return false;
-        	}
-		if( this.supportNative != other.supportNative ) return false;
-		return true;
-	}
-	public static String getEnumName(String fieldName ) {
-		if( "activeStatus".equals(fieldName) ) {
-			return "CommonEnums.ActiveStatus";
-		}
-		if( "assetType".equals(fieldName) ) {
-			return "CommonEnums.AssetType";
-		}
-		//Later TODO
-		//return super.getEnumName(fieldName);
-		return null;
-	}
 
 }
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXAuditMap.java b/security-admin/src/main/java/org/apache/ranger/entity/XXAuditMap.java
index 60695af4d..bc9dc4b55 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXAuditMap.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXAuditMap.java
@@ -17,13 +17,14 @@
  * under the License.
  */
 
- package org.apache.ranger.entity;
+package org.apache.ranger.entity;
 
 /**
  * Audi map
- *
  */
 
+import org.apache.ranger.common.AppConstants;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -32,198 +33,184 @@ import javax.persistence.Id;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 
-import org.apache.ranger.common.AppConstants;
-
-
 @Entity
-@Table(name="x_audit_map")
+@Table(name = "x_audit_map")
 public class XXAuditMap extends XXDBBase implements java.io.Serializable {
-	private static final long serialVersionUID = 1L;
-
-
-	@Id
-	@SequenceGenerator(name="X_AUDIT_MAP_SEQ",sequenceName="X_AUDIT_MAP_SEQ",allocationSize=1)
-	@GeneratedValue(strategy=GenerationType.AUTO,generator="X_AUDIT_MAP_SEQ")
-	@Column(name="ID")
-	protected Long id;
-	@Override
-	public void setId(Long id) {
-		this.id=id;
-	}
-
-	@Override
-	public Long getId() {
-		return id;
-	}
-
-	/**
-	 * Id of the resource
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Column(name="RES_ID"   )
-	protected Long resourceId;
-
-
-	/**
-	 * Id of the group
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Column(name="GROUP_ID"   )
-	protected Long groupId;
-
-
-	/**
-	 * Id of the user
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Column(name="USER_ID"   )
-	protected Long userId;
-
-
-	/**
-	 * Type of audit
-	 * <ul>
-	 * <li>This attribute is of type enum CommonEnums::XAAuditType
-	 * </ul>
-	 *
-	 */
-	@Column(name="AUDIT_TYPE"  , nullable=false )
-	protected int auditType = AppConstants.XA_AUDIT_TYPE_UNKNOWN;
-
-	/**
-	 * Default constructor. This will set all the attributes to default value.
-	 */
-	public XXAuditMap ( ) {
-		auditType = AppConstants.XA_AUDIT_TYPE_UNKNOWN;
-	}
-
-	@Override
-	public int getMyClassType( ) {
-	    return AppConstants.CLASS_TYPE_XA_AUDIT_MAP;
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b>resourceId</b>.
-	 * You cannot set null to the attribute.
-	 * @param resourceId Value to set member attribute <b>resourceId</b>
-	 */
-	public void setResourceId( Long resourceId ) {
-		this.resourceId = resourceId;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>resourceId</b>
-	 * @return Long - value of member attribute <b>resourceId</b>.
-	 */
-	public Long getResourceId( ) {
-		return this.resourceId;
-	}
-
-
-	/**
-	 * This method sets the value to the member attribute <b>groupId</b>.
-	 * You cannot set null to the attribute.
-	 * @param groupId Value to set member attribute <b>groupId</b>
-	 */
-	public void setGroupId( Long groupId ) {
-		this.groupId = groupId;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>groupId</b>
-	 * @return Long - value of member attribute <b>groupId</b>.
-	 */
-	public Long getGroupId( ) {
-		return this.groupId;
-	}
-
-
-	/**
-	 * This method sets the value to the member attribute <b>userId</b>.
-	 * You cannot set null to the attribute.
-	 * @param userId Value to set member attribute <b>userId</b>
-	 */
-	public void setUserId( Long userId ) {
-		this.userId = userId;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>userId</b>
-	 * @return Long - value of member attribute <b>userId</b>.
-	 */
-	public Long getUserId( ) {
-		return this.userId;
-	}
-
-
-	/**
-	 * This method sets the value to the member attribute <b>auditType</b>.
-	 * You cannot set null to the attribute.
-	 * @param auditType Value to set member attribute <b>auditType</b>
-	 */
-	public void setAuditType( int auditType ) {
-		this.auditType = auditType;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>auditType</b>
-	 * @return int - value of member attribute <b>auditType</b>.
-	 */
-	public int getAuditType( ) {
-		return this.auditType;
-	}
-
-	/**
-	 * This return the bean content in string format
-	 * @return formatedStr
-	*/
-	@Override
-	public String toString( ) {
-		String str = "XXAuditMap={";
-		str += super.toString();
-		str += "resourceId={" + resourceId + "} ";
-		str += "groupId={" + groupId + "} ";
-		str += "userId={" + userId + "} ";
-		str += "auditType={" + auditType + "} ";
-		str += "}";
-		return str;
-	}
-
-	/**
-	 * Checks for all attributes except referenced db objects
-	 * @return true if all attributes match
-	*/
-	@Override
-	public boolean equals( Object obj) {
-		if ( !super.equals(obj) ) {
-			return false;
-		}
-		XXAuditMap other = (XXAuditMap) obj;
-        	if ((this.resourceId == null && other.resourceId != null) || (this.resourceId != null && !this.resourceId.equals(other.resourceId))) {
-            		return false;
-        	}
-        	if ((this.groupId == null && other.groupId != null) || (this.groupId != null && !this.groupId.equals(other.groupId))) {
-            		return false;
-        	}
-        	if ((this.userId == null && other.userId != null) || (this.userId != null && !this.userId.equals(other.userId))) {
-            		return false;
-        	}
-		if( this.auditType != other.auditType ) return false;
-		return true;
-	}
-	public static String getEnumName(String fieldName ) {
-		if( "auditType".equals(fieldName) ) {
-			return "CommonEnums.XAAuditType";
-		}
-		//Later TODO
-		//return super.getEnumName(fieldName);
-		return null;
-	}
-
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @SequenceGenerator(name = "X_AUDIT_MAP_SEQ", sequenceName = "X_AUDIT_MAP_SEQ", allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.AUTO, generator = "X_AUDIT_MAP_SEQ")
+    @Column(name = "ID")
+    protected Long id;
+    /**
+     * Id of the resource
+     * <ul>
+     * </ul>
+     *
+     */
+    @Column(name = "RES_ID")
+    protected Long resourceId;
+    /**
+     * Id of the group
+     * <ul>
+     * </ul>
+     *
+     */
+    @Column(name = "GROUP_ID")
+    protected Long groupId;
+    /**
+     * Id of the user
+     * <ul>
+     * </ul>
+     *
+     */
+    @Column(name = "USER_ID")
+    protected Long userId;
+    /**
+     * Type of audit
+     * <ul>
+     * <li>This attribute is of type enum CommonEnums::XAAuditType
+     * </ul>
+     *
+     */
+    @Column(name = "AUDIT_TYPE", nullable = false)
+    protected int auditType = AppConstants.XA_AUDIT_TYPE_UNKNOWN;
+
+    /**
+     * Default constructor. This will set all the attributes to default value.
+     */
+    public XXAuditMap() {
+        auditType = AppConstants.XA_AUDIT_TYPE_UNKNOWN;
+    }
+
+    public static String getEnumName(String fieldName) {
+        if ("auditType".equals(fieldName)) {
+            return "CommonEnums.XAAuditType";
+        }
+        //Later TODO
+        //return super.getEnumName(fieldName);
+        return null;
+    }
+
+    @Override
+    public int getMyClassType() {
+        return AppConstants.CLASS_TYPE_XA_AUDIT_MAP;
+    }
+
+    @Override
+    public Long getId() {
+        return id;
+    }
+
+    @Override
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * Checks for all attributes except referenced db objects
+     * @return true if all attributes match
+     */
+    @Override
+    public boolean equals(Object obj) {
+        if (!super.equals(obj)) {
+            return false;
+        }
+        XXAuditMap other = (XXAuditMap) obj;
+        if ((this.resourceId == null && other.resourceId != null) || (this.resourceId != null && !this.resourceId.equals(other.resourceId))) {
+            return false;
+        }
+        if ((this.groupId == null && other.groupId != null) || (this.groupId != null && !this.groupId.equals(other.groupId))) {
+            return false;
+        }
+        if ((this.userId == null && other.userId != null) || (this.userId != null && !this.userId.equals(other.userId))) {
+            return false;
+        }
+        return this.auditType == other.auditType;
+    }
+
+    /**
+     * This return the bean content in string format
+     * @return formatedStr
+     */
+    @Override
+    public String toString() {
+        String str = "XXAuditMap={";
+        str += super.toString();
+        str += "resourceId={" + resourceId + "} ";
+        str += "groupId={" + groupId + "} ";
+        str += "userId={" + userId + "} ";
+        str += "auditType={" + auditType + "} ";
+        str += "}";
+        return str;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>resourceId</b>
+     * @return Long - value of member attribute <b>resourceId</b>.
+     */
+    public Long getResourceId() {
+        return this.resourceId;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b>resourceId</b>.
+     * You cannot set null to the attribute.
+     * @param resourceId Value to set member attribute <b>resourceId</b>
+     */
+    public void setResourceId(Long resourceId) {
+        this.resourceId = resourceId;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>groupId</b>
+     * @return Long - value of member attribute <b>groupId</b>.
+     */
+    public Long getGroupId() {
+        return this.groupId;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b>groupId</b>.
+     * You cannot set null to the attribute.
+     * @param groupId Value to set member attribute <b>groupId</b>
+     */
+    public void setGroupId(Long groupId) {
+        this.groupId = groupId;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>userId</b>
+     * @return Long - value of member attribute <b>userId</b>.
+     */
+    public Long getUserId() {
+        return this.userId;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b>userId</b>.
+     * You cannot set null to the attribute.
+     * @param userId Value to set member attribute <b>userId</b>
+     */
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>auditType</b>
+     * @return int - value of member attribute <b>auditType</b>.
+     */
+    public int getAuditType() {
+        return this.auditType;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b>auditType</b>.
+     * You cannot set null to the attribute.
+     * @param auditType Value to set member attribute <b>auditType</b>
+     */
+    public void setAuditType(int auditType) {
+        this.auditType = auditType;
+    }
 }
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXAuthSession.java b/security-admin/src/main/java/org/apache/ranger/entity/XXAuthSession.java
index c03bb1129..2842a5725 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXAuthSession.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXAuthSession.java
@@ -17,14 +17,15 @@
  * under the License.
  */
 
- package org.apache.ranger.entity;
+package org.apache.ranger.entity;
 
 /**
  * Authentication session
- *
  */
 
-import java.util.Date;
+import org.apache.ranger.common.AppConstants;
+import org.apache.ranger.common.DateUtil;
+import org.apache.ranger.common.RangerConstants;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -36,458 +37,441 @@ import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 
-import org.apache.ranger.common.AppConstants;
-import org.apache.ranger.common.DateUtil;
-import org.apache.ranger.common.RangerConstants;
-
+import java.util.Date;
 
 @Entity
-@Table(name="x_auth_sess")
+@Table(name = "x_auth_sess")
 public class XXAuthSession extends XXDBBase implements java.io.Serializable {
-	private static final long serialVersionUID = 1L;
-
-	@Id
-	@SequenceGenerator(name="X_AUTH_SESS_SEQ",sequenceName="X_AUTH_SESS_SEQ",allocationSize=1)
-	@GeneratedValue(strategy=GenerationType.AUTO,generator="X_AUTH_SESS_SEQ")
-	@Column(name="ID")
-	protected Long id;
-	@Override
-	public void setId(Long id) {
-		this.id=id;
-	}
-
-	@Override
-	public Long getId() {
-		return id;
-	}
-	/**
-	 * Enum values for AuthStatus
-	 */
-	/**
-	 * AUTH_STATUS_UNKNOWN is an element of enum AuthStatus. Its value is "AUTH_STATUS_UNKNOWN".
-	 */
-	public static final int AUTH_STATUS_UNKNOWN = 0;
-	/**
-	 * AUTH_STATUS_SUCCESS is an element of enum AuthStatus. Its value is "AUTH_STATUS_SUCCESS".
-	 */
-	public static final int AUTH_STATUS_SUCCESS = 1;
-	/**
-	 * AUTH_STATUS_WRONG_PASSWORD is an element of enum AuthStatus. Its value is "AUTH_STATUS_WRONG_PASSWORD".
-	 */
-	public static final int AUTH_STATUS_WRONG_PASSWORD = 2;
-	/**
-	 * AUTH_STATUS_DISABLED is an element of enum AuthStatus. Its value is "AUTH_STATUS_DISABLED".
-	 */
-	public static final int AUTH_STATUS_DISABLED = 3;
-	/**
-	 * AUTH_STATUS_LOCKED is an element of enum AuthStatus. Its value is "AUTH_STATUS_LOCKED".
-	 */
-	public static final int AUTH_STATUS_LOCKED = 4;
-	/**
-	 * AUTH_STATUS_PASSWORD_EXPIRED is an element of enum AuthStatus. Its value is "AUTH_STATUS_PASSWORD_EXPIRED".
-	 */
-	public static final int AUTH_STATUS_PASSWORD_EXPIRED = 5;
-	/**
-	 * AUTH_STATUS_USER_NOT_FOUND is an element of enum AuthStatus. Its value is "AUTH_STATUS_USER_NOT_FOUND".
-	 */
-	public static final int AUTH_STATUS_USER_NOT_FOUND = 6;
-
-	/**
-	 * Max value for enum AuthStatus_MAX
-	 */
-	public static final int AuthStatus_MAX = 6;
-
-	/**
-	 * Enum values for AuthType
-	 */
-	/**
-	 * AUTH_TYPE_UNKNOWN is an element of enum AuthType. Its value is "AUTH_TYPE_UNKNOWN".
-	 */
-	public static final int AUTH_TYPE_UNKNOWN = 0;
-	/**
-	 * AUTH_TYPE_PASSWORD is an element of enum AuthType. Its value is "AUTH_TYPE_PASSWORD".
-	 */
-	public static final int AUTH_TYPE_PASSWORD = 1;
-
-	/**
-	 * AUTH_TYPE_KERBEROS is an element of enum AuthType. Its value is "AUTH_TYPE_KERBEROS".
-	 */
-	public static final int AUTH_TYPE_KERBEROS = 2;
-
-	/**
-	 * AUTH_TYPE_SSO is an element of enum AuthType. Its value is "AUTH_TYPE_SSO".
-	 */
-	public static final int AUTH_TYPE_SSO = 3;
-
-	/**
-	 * AUTH_TYPE_TRUSTED_PROXY is an element of enum AuthType. Its value is "AUTH_TYPE_TRUSTED_PROXY".
-	 */
-	public static final int AUTH_TYPE_TRUSTED_PROXY = 4;
-
-	/**
-	 * Max value for enum AuthType_MAX
-	 */
-	public static final int AuthType_MAX = 4;
-
-
-
-	/**
-	 * Login ID of the user
-	 * <ul>
-	 * <li>The maximum length for this attribute is <b>767</b>.
-	 * </ul>
-	 *
-	 */
-	@Column(name="LOGIN_ID"  , nullable=false , length=767)
-	protected String loginId;
-
-	/**
-	 * Id of the user
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Column(name="USER_ID"   )
-	protected Long userId;
-
-
-	/**
-	 * External session id. Currently spring/http session
-	 * <ul>
-	 * <li>The maximum length for this attribute is <b>512</b>.
-	 * </ul>
-	 *
-	 */
-	@Column(name="EXT_SESS_ID"   , length=512)
-	protected String extSessionId;
-
-	/**
-	 * Date and time of authentication
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name="AUTH_TIME"  , nullable=false )
-	protected Date authTime = DateUtil.getUTCDate();
-
-	/**
-	 * Authentication status
-	 * <ul>
-	 * <li>This attribute is of type enum XXAuthSession::AuthStatus
-	 * </ul>
-	 *
-	 */
-	@Column(name="AUTH_STATUS"  , nullable=false )
-	protected int authStatus = AUTH_STATUS_UNKNOWN;
-
-	/**
-	 * Authentication type
-	 * <ul>
-	 * <li>This attribute is of type enum XXAuthSession::AuthType
-	 * </ul>
-	 *
-	 */
-	@Column(name="AUTH_TYPE"  , nullable=false )
-	protected int authType = AUTH_TYPE_UNKNOWN;
-
-	/**
-	 * Authentication provider
-	 * <ul>
-	 * <li>This attribute is of type enum XXAuthSession::AuthType
-	 * </ul>
-	 *
-	 */
-	@Column(name="AUTH_PROVIDER"  , nullable=false )
-	protected int authProvider = AUTH_TYPE_UNKNOWN;
-
-	/**
-	 * Type of the device
-	 * <ul>
-	 * <li>This attribute is of type enum CommonEnums::DeviceType
-	 * </ul>
-	 *
-	 */
-	@Column(name="DEVICE_TYPE"  , nullable=false )
-	protected int deviceType = RangerConstants.DEVICE_UNKNOWN;
-
-	/**
-	 * IP where the request came from
-	 * <ul>
-	 * <li>The maximum length for this attribute is <b>48</b>.
-	 * </ul>
-	 *
-	 */
-	@Column(name="REQ_IP"  , nullable=false , length=48)
-	protected String requestIP;
-
-	/**
-	 * UserAgent of the requesting device
-	 * <ul>
-	 * <li>The maximum length for this attribute is <b>1024</b>.
-	 * </ul>
-	 *
-	 */
-	@Column(name="REQ_UA"   , length=1024)
-	protected String requestUserAgent;
-
-	/**
-	 * Default constructor. This will set all the attributes to default value.
-	 */
-	public XXAuthSession ( ) {
-		authStatus = AUTH_STATUS_UNKNOWN;
-		authType = AUTH_TYPE_UNKNOWN;
-		authProvider = AUTH_TYPE_UNKNOWN;
-		deviceType = RangerConstants.DEVICE_UNKNOWN;
-	}
-
-	@Override
-	public int getMyClassType( ) {
-	    return AppConstants.CLASS_TYPE_AUTH_SESS;
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b>loginId</b>.
-	 * You cannot set null to the attribute.
-	 * @param loginId Value to set member attribute <b>loginId</b>
-	 */
-	public void setLoginId( String loginId ) {
-		this.loginId = loginId;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>loginId</b>
-	 * @return String - value of member attribute <b>loginId</b>.
-	 */
-	public String getLoginId( ) {
-		return this.loginId;
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b>userId</b>.
-	 * You cannot set null to the attribute.
-	 * @param userId Value to set member attribute <b>userId</b>
-	 */
-	public void setUserId( Long userId ) {
-		this.userId = userId;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>userId</b>
-	 * @return Long - value of member attribute <b>userId</b>.
-	 */
-	public Long getUserId( ) {
-		return this.userId;
-	}
-
-
-	/**
-	 * This method sets the value to the member attribute <b>extSessionId</b>.
-	 * You cannot set null to the attribute.
-	 * @param extSessionId Value to set member attribute <b>extSessionId</b>
-	 */
-	public void setExtSessionId( String extSessionId ) {
-		this.extSessionId = extSessionId;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>extSessionId</b>
-	 * @return String - value of member attribute <b>extSessionId</b>.
-	 */
-	public String getExtSessionId( ) {
-		return this.extSessionId;
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b>authTime</b>.
-	 * You cannot set null to the attribute.
-	 * @param authTime Value to set member attribute <b>authTime</b>
-	 */
-	public void setAuthTime( Date authTime ) {
-		this.authTime = authTime;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>authTime</b>
-	 * @return Date - value of member attribute <b>authTime</b>.
-	 */
-	public Date getAuthTime( ) {
-		return this.authTime;
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b>authStatus</b>.
-	 * You cannot set null to the attribute.
-	 * @param authStatus Value to set member attribute <b>authStatus</b>
-	 */
-	public void setAuthStatus( int authStatus ) {
-		this.authStatus = authStatus;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>authStatus</b>
-	 * @return int - value of member attribute <b>authStatus</b>.
-	 */
-	public int getAuthStatus( ) {
-		return this.authStatus;
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b>authType</b>.
-	 * You cannot set null to the attribute.
-	 * @param authType Value to set member attribute <b>authType</b>
-	 */
-	public void setAuthType( int authType ) {
-		this.authType = authType;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>authType</b>
-	 * @return int - value of member attribute <b>authType</b>.
-	 */
-	public int getAuthType( ) {
-		return this.authType;
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b>authProvider</b>.
-	 * You cannot set null to the attribute.
-	 * @param authProvider Value to set member attribute <b>authProvider</b>
-	 */
-	public void setAuthProvider( int authProvider ) {
-		this.authProvider = authProvider;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>authProvider</b>
-	 * @return int - value of member attribute <b>authProvider</b>.
-	 */
-	public int getAuthProvider( ) {
-		return this.authProvider;
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b>deviceType</b>.
-	 * You cannot set null to the attribute.
-	 * @param deviceType Value to set member attribute <b>deviceType</b>
-	 */
-	public void setDeviceType( int deviceType ) {
-		this.deviceType = deviceType;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>deviceType</b>
-	 * @return int - value of member attribute <b>deviceType</b>.
-	 */
-	public int getDeviceType( ) {
-		return this.deviceType;
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b>requestIP</b>.
-	 * You cannot set null to the attribute.
-	 * @param requestIP Value to set member attribute <b>requestIP</b>
-	 */
-	public void setRequestIP( String requestIP ) {
-		this.requestIP = requestIP;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>requestIP</b>
-	 * @return String - value of member attribute <b>requestIP</b>.
-	 */
-	public String getRequestIP( ) {
-		return this.requestIP;
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b>requestUserAgent</b>.
-	 * You cannot set null to the attribute.
-	 * @param requestUserAgent Value to set member attribute <b>requestUserAgent</b>
-	 */
-	public void setRequestUserAgent( String requestUserAgent ) {
-		this.requestUserAgent = requestUserAgent;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>requestUserAgent</b>
-	 * @return String - value of member attribute <b>requestUserAgent</b>.
-	 */
-	public String getRequestUserAgent( ) {
-		return this.requestUserAgent;
-	}
-
-	/**
-	 * This return the bean content in string format
-	 * @return formatedStr
-	*/
-	@Override
-	public String toString( ) {
-		String str = "XXAuthSession={";
-		str += super.toString();
-		str += "loginId={" + loginId + "} ";
-		str += "userId={" + userId + "} ";
-		str += "authTime={" + authTime + "} ";
-		str += "authStatus={" + authStatus + "} ";
-		str += "authType={" + authType + "} ";
-		str += "authProvider={" + authProvider + "} ";
-		str += "deviceType={" + deviceType + "} ";
-		str += "requestIP={" + requestIP + "} ";
-		str += "requestUserAgent={" + requestUserAgent + "} ";
-		str += "}";
-		return str;
-	}
-
-	/**
-	 * Checks for all attributes except referenced db objects
-	 * @return true if all attributes match
-	*/
-	@Override
-	public boolean equals( Object obj) {
-		if ( !super.equals(obj) ) {
-			return false;
-		}
-		XXAuthSession other = (XXAuthSession) obj;
-        	if ((this.loginId == null && other.loginId != null) || (this.loginId != null && !this.loginId.equals(other.loginId))) {
-            		return false;
-        	}
-        	if ((this.userId == null && other.userId != null) || (this.userId != null && !this.userId.equals(other.userId))) {
-            		return false;
-        	}
-        	if ((this.extSessionId == null && other.extSessionId != null) || (this.extSessionId != null && !this.extSessionId.equals(other.extSessionId))) {
-            		return false;
-        	}
-        	if ((this.authTime == null && other.authTime != null) || (this.authTime != null && !this.authTime.equals(other.authTime))) {
-            		return false;
-        	}
-		if( this.authStatus != other.authStatus ) return false;
-		if( this.authType != other.authType ) return false;
-		if( this.authProvider != other.authProvider ) return false;
-		if( this.deviceType != other.deviceType ) return false;
-        	if ((this.requestIP == null && other.requestIP != null) || (this.requestIP != null && !this.requestIP.equals(other.requestIP))) {
-            		return false;
-        	}
-        	if ((this.requestUserAgent == null && other.requestUserAgent != null) || (this.requestUserAgent != null && !this.requestUserAgent.equals(other.requestUserAgent))) {
-            		return false;
-        	}
-		return true;
-	}
-	public static String getEnumName(String fieldName ) {
-		if( "authStatus".equals(fieldName) ) {
-			return "CommonEnums.AuthStatus";
-		}
-		if( "authType".equals(fieldName) ) {
-			return "CommonEnums.AuthType";
-		}
-		if( "authProvider".equals(fieldName) ) {
-			return "CommonEnums.AuthType";
-		}
-		if( "deviceType".equals(fieldName) ) {
-			return "CommonEnums.DeviceType";
-		}
-		//Later TODO
-		//return super.getEnumName(fieldName);
-		return null;
-	}
-
+    /**
+     * AUTH_STATUS_UNKNOWN is an element of enum AuthStatus. Its value is "AUTH_STATUS_UNKNOWN".
+     */
+    public static final int AUTH_STATUS_UNKNOWN          = 0;
+    /**
+     * AUTH_STATUS_SUCCESS is an element of enum AuthStatus. Its value is "AUTH_STATUS_SUCCESS".
+     */
+    public static final int AUTH_STATUS_SUCCESS          = 1;
+    /**
+     * AUTH_STATUS_WRONG_PASSWORD is an element of enum AuthStatus. Its value is "AUTH_STATUS_WRONG_PASSWORD".
+     */
+    public static final int AUTH_STATUS_WRONG_PASSWORD   = 2;
+    /**
+     * AUTH_STATUS_DISABLED is an element of enum AuthStatus. Its value is "AUTH_STATUS_DISABLED".
+     */
+    public static final int AUTH_STATUS_DISABLED         = 3;
+    /**
+     * Enum values for AuthStatus
+     */
+    /**
+     * AUTH_STATUS_LOCKED is an element of enum AuthStatus. Its value is "AUTH_STATUS_LOCKED".
+     */
+    public static final int AUTH_STATUS_LOCKED           = 4;
+    /**
+     * AUTH_STATUS_PASSWORD_EXPIRED is an element of enum AuthStatus. Its value is "AUTH_STATUS_PASSWORD_EXPIRED".
+     */
+    public static final int AUTH_STATUS_PASSWORD_EXPIRED = 5;
+    /**
+     * AUTH_STATUS_USER_NOT_FOUND is an element of enum AuthStatus. Its value is "AUTH_STATUS_USER_NOT_FOUND".
+     */
+    public static final int AUTH_STATUS_USER_NOT_FOUND   = 6;
+    /**
+     * Max value for enum AuthStatus_MAX
+     */
+    public static final int AuthStatus_MAX = 6;
+    /**
+     * AUTH_TYPE_UNKNOWN is an element of enum AuthType. Its value is "AUTH_TYPE_UNKNOWN".
+     */
+    public static final int AUTH_TYPE_UNKNOWN  = 0;
+    /**
+     * AUTH_TYPE_PASSWORD is an element of enum AuthType. Its value is "AUTH_TYPE_PASSWORD".
+     */
+    public static final int AUTH_TYPE_PASSWORD = 1;
+    /**
+     * AUTH_TYPE_KERBEROS is an element of enum AuthType. Its value is "AUTH_TYPE_KERBEROS".
+     */
+    public static final int AUTH_TYPE_KERBEROS = 2;
+    /**
+     * AUTH_TYPE_SSO is an element of enum AuthType. Its value is "AUTH_TYPE_SSO".
+     */
+    public static final int AUTH_TYPE_SSO = 3;
+
+    /**
+     * Enum values for AuthType
+     */
+    /**
+     * AUTH_TYPE_TRUSTED_PROXY is an element of enum AuthType. Its value is "AUTH_TYPE_TRUSTED_PROXY".
+     */
+    public static final int AUTH_TYPE_TRUSTED_PROXY = 4;
+    /**
+     * Max value for enum AuthType_MAX
+     */
+    public static final int AuthType_MAX = 4;
+    private static final long serialVersionUID = 1L;
+    @Id
+    @SequenceGenerator(name = "X_AUTH_SESS_SEQ", sequenceName = "X_AUTH_SESS_SEQ", allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.AUTO, generator = "X_AUTH_SESS_SEQ")
+    @Column(name = "ID")
+    protected Long id;
+    /**
+     * Login ID of the user
+     * <ul>
+     * <li>The maximum length for this attribute is <b>767</b>.
+     * </ul>
+     *
+     */
+    @Column(name = "LOGIN_ID", nullable = false, length = 767)
+    protected String loginId;
+    /**
+     * Id of the user
+     * <ul>
+     * </ul>
+     *
+     */
+    @Column(name = "USER_ID")
+    protected Long userId;
+    /**
+     * External session id. Currently spring/http session
+     * <ul>
+     * <li>The maximum length for this attribute is <b>512</b>.
+     * </ul>
+     *
+     */
+    @Column(name = "EXT_SESS_ID", length = 512)
+    protected String extSessionId;
+    /**
+     * Date and time of authentication
+     * <ul>
+     * </ul>
+     *
+     */
+    @Temporal(TemporalType.TIMESTAMP)
+    @Column(name = "AUTH_TIME", nullable = false)
+    protected Date authTime = DateUtil.getUTCDate();
+    /**
+     * Authentication status
+     * <ul>
+     * <li>This attribute is of type enum XXAuthSession::AuthStatus
+     * </ul>
+     *
+     */
+    @Column(name = "AUTH_STATUS", nullable = false)
+    protected int authStatus = AUTH_STATUS_UNKNOWN;
+    /**
+     * Authentication type
+     * <ul>
+     * <li>This attribute is of type enum XXAuthSession::AuthType
+     * </ul>
+     *
+     */
+    @Column(name = "AUTH_TYPE", nullable = false)
+    protected int authType = AUTH_TYPE_UNKNOWN;
+    /**
+     * Authentication provider
+     * <ul>
+     * <li>This attribute is of type enum XXAuthSession::AuthType
+     * </ul>
+     *
+     */
+    @Column(name = "AUTH_PROVIDER", nullable = false)
+    protected int authProvider = AUTH_TYPE_UNKNOWN;
+    /**
+     * Type of the device
+     * <ul>
+     * <li>This attribute is of type enum CommonEnums::DeviceType
+     * </ul>
+     *
+     */
+    @Column(name = "DEVICE_TYPE", nullable = false)
+    protected int deviceType = RangerConstants.DEVICE_UNKNOWN;
+    /**
+     * IP where the request came from
+     * <ul>
+     * <li>The maximum length for this attribute is <b>48</b>.
+     * </ul>
+     *
+     */
+    @Column(name = "REQ_IP", nullable = false, length = 48)
+    protected String requestIP;
+    /**
+     * UserAgent of the requesting device
+     * <ul>
+     * <li>The maximum length for this attribute is <b>1024</b>.
+     * </ul>
+     *
+     */
+    @Column(name = "REQ_UA", length = 1024)
+    protected String requestUserAgent;
+
+    /**
+     * Default constructor. This will set all the attributes to default value.
+     */
+    public XXAuthSession() {
+        authStatus   = AUTH_STATUS_UNKNOWN;
+        authType     = AUTH_TYPE_UNKNOWN;
+        authProvider = AUTH_TYPE_UNKNOWN;
+        deviceType   = RangerConstants.DEVICE_UNKNOWN;
+    }
+
+    public static String getEnumName(String fieldName) {
+        if ("authStatus".equals(fieldName)) {
+            return "CommonEnums.AuthStatus";
+        }
+        if ("authType".equals(fieldName)) {
+            return "CommonEnums.AuthType";
+        }
+        if ("authProvider".equals(fieldName)) {
+            return "CommonEnums.AuthType";
+        }
+        if ("deviceType".equals(fieldName)) {
+            return "CommonEnums.DeviceType";
+        }
+        //Later TODO
+        //return super.getEnumName(fieldName);
+        return null;
+    }
+
+    @Override
+    public int getMyClassType() {
+        return AppConstants.CLASS_TYPE_AUTH_SESS;
+    }
+
+    @Override
+    public Long getId() {
+        return id;
+    }
+
+    @Override
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * Checks for all attributes except referenced db objects
+     * @return true if all attributes match
+     */
+    @Override
+    public boolean equals(Object obj) {
+        if (!super.equals(obj)) {
+            return false;
+        }
+        XXAuthSession other = (XXAuthSession) obj;
+        if ((this.loginId == null && other.loginId != null) || (this.loginId != null && !this.loginId.equals(other.loginId))) {
+            return false;
+        }
+        if ((this.userId == null && other.userId != null) || (this.userId != null && !this.userId.equals(other.userId))) {
+            return false;
+        }
+        if ((this.extSessionId == null && other.extSessionId != null) || (this.extSessionId != null && !this.extSessionId.equals(other.extSessionId))) {
+            return false;
+        }
+        if ((this.authTime == null && other.authTime != null) || (this.authTime != null && !this.authTime.equals(other.authTime))) {
+            return false;
+        }
+        if (this.authStatus != other.authStatus) {
+            return false;
+        }
+        if (this.authType != other.authType) {
+            return false;
+        }
+        if (this.authProvider != other.authProvider) {
+            return false;
+        }
+        if (this.deviceType != other.deviceType) {
+            return false;
+        }
+        if ((this.requestIP == null && other.requestIP != null) || (this.requestIP != null && !this.requestIP.equals(other.requestIP))) {
+            return false;
+        }
+        return (this.requestUserAgent != null || other.requestUserAgent == null) && (this.requestUserAgent == null || this.requestUserAgent.equals(other.requestUserAgent));
+    }
+
+    /**
+     * This return the bean content in string format
+     * @return formatedStr
+     */
+    @Override
+    public String toString() {
+        String str = "XXAuthSession={";
+        str += super.toString();
+        str += "loginId={" + loginId + "} ";
+        str += "userId={" + userId + "} ";
+        str += "authTime={" + authTime + "} ";
+        str += "authStatus={" + authStatus + "} ";
+        str += "authType={" + authType + "} ";
+        str += "authProvider={" + authProvider + "} ";
+        str += "deviceType={" + deviceType + "} ";
+        str += "requestIP={" + requestIP + "} ";
+        str += "requestUserAgent={" + requestUserAgent + "} ";
+        str += "}";
+        return str;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>loginId</b>
+     * @return String - value of member attribute <b>loginId</b>.
+     */
+    public String getLoginId() {
+        return this.loginId;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b>loginId</b>.
+     * You cannot set null to the attribute.
+     * @param loginId Value to set member attribute <b>loginId</b>
+     */
+    public void setLoginId(String loginId) {
+        this.loginId = loginId;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>userId</b>
+     * @return Long - value of member attribute <b>userId</b>.
+     */
+    public Long getUserId() {
+        return this.userId;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b>userId</b>.
+     * You cannot set null to the attribute.
+     * @param userId Value to set member attribute <b>userId</b>
+     */
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>extSessionId</b>
+     * @return String - value of member attribute <b>extSessionId</b>.
+     */
+    public String getExtSessionId() {
+        return this.extSessionId;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b>extSessionId</b>.
+     * You cannot set null to the attribute.
+     * @param extSessionId Value to set member attribute <b>extSessionId</b>
+     */
+    public void setExtSessionId(String extSessionId) {
+        this.extSessionId = extSessionId;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>authTime</b>
+     * @return Date - value of member attribute <b>authTime</b>.
+     */
+    public Date getAuthTime() {
+        return this.authTime;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b>authTime</b>.
+     * You cannot set null to the attribute.
+     * @param authTime Value to set member attribute <b>authTime</b>
+     */
+    public void setAuthTime(Date authTime) {
+        this.authTime = authTime;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>authStatus</b>
+     * @return int - value of member attribute <b>authStatus</b>.
+     */
+    public int getAuthStatus() {
+        return this.authStatus;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b>authStatus</b>.
+     * You cannot set null to the attribute.
+     * @param authStatus Value to set member attribute <b>authStatus</b>
+     */
+    public void setAuthStatus(int authStatus) {
+        this.authStatus = authStatus;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>authType</b>
+     * @return int - value of member attribute <b>authType</b>.
+     */
+    public int getAuthType() {
+        return this.authType;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b>authType</b>.
+     * You cannot set null to the attribute.
+     * @param authType Value to set member attribute <b>authType</b>
+     */
+    public void setAuthType(int authType) {
+        this.authType = authType;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>authProvider</b>
+     * @return int - value of member attribute <b>authProvider</b>.
+     */
+    public int getAuthProvider() {
+        return this.authProvider;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b>authProvider</b>.
+     * You cannot set null to the attribute.
+     * @param authProvider Value to set member attribute <b>authProvider</b>
+     */
+    public void setAuthProvider(int authProvider) {
+        this.authProvider = authProvider;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>deviceType</b>
+     * @return int - value of member attribute <b>deviceType</b>.
+     */
+    public int getDeviceType() {
+        return this.deviceType;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b>deviceType</b>.
+     * You cannot set null to the attribute.
+     * @param deviceType Value to set member attribute <b>deviceType</b>
+     */
+    public void setDeviceType(int deviceType) {
+        this.deviceType = deviceType;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>requestIP</b>
+     * @return String - value of member attribute <b>requestIP</b>.
+     */
+    public String getRequestIP() {
+        return this.requestIP;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b>requestIP</b>.
+     * You cannot set null to the attribute.
+     * @param requestIP Value to set member attribute <b>requestIP</b>
+     */
+    public void setRequestIP(String requestIP) {
+        this.requestIP = requestIP;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>requestUserAgent</b>
+     * @return String - value of member attribute <b>requestUserAgent</b>.
+     */
+    public String getRequestUserAgent() {
+        return this.requestUserAgent;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b>requestUserAgent</b>.
+     * You cannot set null to the attribute.
+     * @param requestUserAgent Value to set member attribute <b>requestUserAgent</b>
+     */
+    public void setRequestUserAgent(String requestUserAgent) {
+        this.requestUserAgent = requestUserAgent;
+    }
 }
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXContextEnricherDef.java b/security-admin/src/main/java/org/apache/ranger/entity/XXContextEnricherDef.java
index 98ae4a394..bef10038f 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXContextEnricherDef.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXContextEnricherDef.java
@@ -18,307 +18,295 @@
  */
 package org.apache.ranger.entity;
 
-import javax.persistence.*;
+import javax.persistence.Cacheable;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
 
 @Entity
 @Cacheable
 @Table(name = "x_context_enricher_def")
 public class XXContextEnricherDef extends XXDBBase implements
-		java.io.Serializable {
-	private static final long serialVersionUID = 1L;
-	/**
-	 * id of the XXContextEnricherDef
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Id
-	@SequenceGenerator(name = "x_context_enricher_def_SEQ", sequenceName = "x_context_enricher_def_SEQ", allocationSize = 1)
-	@GeneratedValue(strategy = GenerationType.AUTO, generator = "x_context_enricher_def_SEQ")
-	@Column(name = "id")
-	protected Long id;
+        java.io.Serializable {
+    private static final long serialVersionUID = 1L;
+    /**
+     * id of the XXContextEnricherDef
+     * <ul>
+     * </ul>
+     */
+    @Id
+    @SequenceGenerator(name = "x_context_enricher_def_SEQ", sequenceName = "x_context_enricher_def_SEQ", allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.AUTO, generator = "x_context_enricher_def_SEQ")
+    @Column(name = "id")
+    protected            Long id;
 
-	/**
-	 * defId of the XXContextEnricherDef
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Column(name = "def_id")
-	protected Long defId;
+    /**
+     * defId of the XXContextEnricherDef
+     * <ul>
+     * </ul>
+     */
+    @Column(name = "def_id")
+    protected Long defId;
 
-	/**
-	 * itemId of the XXContextEnricherDef
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Column(name = "item_id")
-	protected Long itemId;
+    /**
+     * itemId of the XXContextEnricherDef
+     * <ul>
+     * </ul>
+     */
+    @Column(name = "item_id")
+    protected Long itemId;
 
-	/**
-	 * name of the XXContextEnricherDef
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Column(name = "name")
-	protected String name;
+    /**
+     * name of the XXContextEnricherDef
+     * <ul>
+     * </ul>
+     */
+    @Column(name = "name")
+    protected String name;
 
-	/**
-	 * enricher of the XXContextEnricherDef
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Column(name = "enricher")
-	protected String enricher;
+    /**
+     * enricher of the XXContextEnricherDef
+     * <ul>
+     * </ul>
+     */
+    @Column(name = "enricher")
+    protected String enricher;
 
-	/**
-	 * enricherOptions of the XXContextEnricherDef
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Column(name = "enricher_options")
-	protected String enricherOptions;
+    /**
+     * enricherOptions of the XXContextEnricherDef
+     * <ul>
+     * </ul>
+     */
+    @Column(name = "enricher_options")
+    protected String enricherOptions;
 
-	/**
-	 * order of the XXContextEnricherDef
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Column(name = "sort_order")
-	protected Integer order;
+    /**
+     * order of the XXContextEnricherDef
+     * <ul>
+     * </ul>
+     */
+    @Column(name = "sort_order")
+    protected Integer order;
 
-	/**
-	 * This method sets the value to the member attribute <b> id</b> . You
-	 * cannot set null to the attribute.
-	 *
-	 * @param id
-	 *            Value to set member attribute <b> id</b>
-	 */
-	public void setId(Long id) {
-		this.id = id;
-	}
+    /**
+     * Returns the value for the member attribute <b>id</b>
+     *
+     * @return Date - value of member attribute <b>id</b> .
+     */
+    public Long getId() {
+        return this.id;
+    }
 
-	/**
-	 * Returns the value for the member attribute <b>id</b>
-	 *
-	 * @return Date - value of member attribute <b>id</b> .
-	 */
-	public Long getId() {
-		return this.id;
-	}
+    /**
+     * This method sets the value to the member attribute <b> id</b> . You
+     * cannot set null to the attribute.
+     *
+     * @param id Value to set member attribute <b> id</b>
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
 
-	/**
-	 * This method sets the value to the member attribute <b> defId</b> . You
-	 * cannot set null to the attribute.
-	 *
-	 * @param defId
-	 *            Value to set member attribute <b> defId</b>
-	 */
-	public void setDefid(Long defId) {
-		this.defId = defId;
-	}
+    /*
+     * (non-Javadoc)
+     *
+     * @see java.lang.Object#equals(java.lang.Object)
+     */
+    @Override
+    public boolean equals(Object obj) {
+        if (!super.equals(obj)) {
+            return false;
+        }
+        if (this == obj) {
+            return true;
+        }
+        if (!super.equals(obj)) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        XXContextEnricherDef other = (XXContextEnricherDef) obj;
+        if (defId == null) {
+            if (other.defId != null) {
+                return false;
+            }
+        } else if (!defId.equals(other.defId)) {
+            return false;
+        }
+        if (itemId == null) {
+            if (other.itemId != null) {
+                return false;
+            }
+        } else if (!itemId.equals(other.itemId)) {
+            return false;
+        }
+        if (enricher == null) {
+            if (other.enricher != null) {
+                return false;
+            }
+        } else if (!enricher.equals(other.enricher)) {
+            return false;
+        }
+        if (enricherOptions == null) {
+            if (other.enricherOptions != null) {
+                return false;
+            }
+        } else if (!enricherOptions.equals(other.enricherOptions)) {
+            return false;
+        }
+        if (id == null) {
+            if (other.id != null) {
+                return false;
+            }
+        } else if (!id.equals(other.id)) {
+            return false;
+        }
+        if (name == null) {
+            if (other.name != null) {
+                return false;
+            }
+        } else if (!name.equals(other.name)) {
+            return false;
+        }
+        if (order == null) {
+            return other.order == null;
+        } else
+            return order.equals(other.order);
+    }
 
-	/**
-	 * Returns the value for the member attribute <b>itemId</b>
-	 *
-	 * @return Long - value of member attribute <b>itemId</b> .
-	 */
-	public Long getItemId() {
-		return this.itemId;
-	}
+    /*
+     * (non-Javadoc)
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        String str = "XXContextEnricherDef={";
+        str += super.toString();
+        str += " [id=" + id + ", defId=" + defId + ", itemId=" + itemId
+                + ", name=" + name + ", enricher=" + enricherOptions
+                + ", enricherOptions=" + enricherOptions + ", order=" + order
+                + "]";
+        str += "}";
+        return str;
+    }
 
-	/**
-	 * This method sets the value to the member attribute <b> defId</b> . You
-	 * cannot set null to the attribute.
-	 *
-	 * @param defId
-	 *            Value to set member attribute <b> defId</b>
-	 */
-	public void setItemId(Long itemId) {
-		this.itemId = itemId;
-	}
+    /**
+     * Returns the value for the member attribute <b>itemId</b>
+     *
+     * @return Long - value of member attribute <b>itemId</b> .
+     */
+    public Long getItemId() {
+        return this.itemId;
+    }
 
-	/**
-	 * Returns the value for the member attribute <b>defId</b>
-	 *
-	 * @return Date - value of member attribute <b>defId</b> .
-	 */
-	public Long getDefid() {
-		return this.defId;
-	}
+    /**
+     * This method sets the value to the member attribute <b> defId</b> . You
+     * cannot set null to the attribute.
+     *
+     * @param defId Value to set member attribute <b> defId</b>
+     */
+    public void setItemId(Long itemId) {
+        this.itemId = itemId;
+    }
 
-	/**
-	 * This method sets the value to the member attribute <b> name</b> . You
-	 * cannot set null to the attribute.
-	 *
-	 * @param name
-	 *            Value to set member attribute <b> name</b>
-	 */
-	public void setName(String name) {
-		this.name = name;
-	}
+    /**
+     * Returns the value for the member attribute <b>defId</b>
+     *
+     * @return Date - value of member attribute <b>defId</b> .
+     */
+    public Long getDefid() {
+        return this.defId;
+    }
 
-	/**
-	 * Returns the value for the member attribute <b>name</b>
-	 *
-	 * @return Date - value of member attribute <b>name</b> .
-	 */
-	public String getName() {
-		return this.name;
-	}
+    /**
+     * This method sets the value to the member attribute <b> defId</b> . You
+     * cannot set null to the attribute.
+     *
+     * @param defId Value to set member attribute <b> defId</b>
+     */
+    public void setDefid(Long defId) {
+        this.defId = defId;
+    }
 
-	/**
-	 * This method sets the value to the member attribute <b> enricher</b> .
-	 * You cannot set null to the attribute.
-	 *
-	 * @param enricher
-	 *            Value to set member attribute <b> enricher</b>
-	 */
-	public void setEnricher(String enricher) {
-		this.enricher = enricher;
-	}
+    /**
+     * Returns the value for the member attribute <b>name</b>
+     *
+     * @return Date - value of member attribute <b>name</b> .
+     */
+    public String getName() {
+        return this.name;
+    }
 
-	/**
-	 * Returns the value for the member attribute <b>enricher</b>
-	 *
-	 * @return String - value of member attribute <b>enricher</b> .
-	 */
-	public String getEnricher() {
-		return this.enricher;
-	}
+    /**
+     * This method sets the value to the member attribute <b> name</b> . You
+     * cannot set null to the attribute.
+     *
+     * @param name Value to set member attribute <b> name</b>
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
 
-	/**
-	 * This method sets the value to the member attribute <b>
-	 * enricherOptions</b> . You cannot set null to the attribute.
-	 *
-	 * @param enricherOptions
-	 *            Value to set member attribute <b> enricherOptions</b>
-	 */
-	public void setEnricherOptions(String enricherOptions) {
-		this.enricherOptions = enricherOptions;
-	}
+    /**
+     * Returns the value for the member attribute <b>enricher</b>
+     *
+     * @return String - value of member attribute <b>enricher</b> .
+     */
+    public String getEnricher() {
+        return this.enricher;
+    }
 
-	/**
-	 * Returns the value for the member attribute <b>evaluatorOptions</b>
-	 *
-	 * @return Date - value of member attribute <b>evaluatorOptions</b> .
-	 */
-	public String getEnricherOptions() {
-		return this.enricherOptions;
-	}
+    /**
+     * This method sets the value to the member attribute <b> enricher</b> .
+     * You cannot set null to the attribute.
+     *
+     * @param enricher Value to set member attribute <b> enricher</b>
+     */
+    public void setEnricher(String enricher) {
+        this.enricher = enricher;
+    }
 
-	/**
-	 * This method sets the value to the member attribute <b> order</b> . You
-	 * cannot set null to the attribute.
-	 *
-	 * @param order
-	 *            Value to set member attribute <b> order</b>
-	 */
-	public void setOrder(Integer order) {
-		this.order = order;
-	}
+    /**
+     * Returns the value for the member attribute <b>evaluatorOptions</b>
+     *
+     * @return Date - value of member attribute <b>evaluatorOptions</b> .
+     */
+    public String getEnricherOptions() {
+        return this.enricherOptions;
+    }
 
-	/**
-	 * Returns the value for the member attribute <b>order</b>
-	 *
-	 * @return Integer - value of member attribute <b>order</b> .
-	 */
-	public Integer getOrder() {
-		return this.order;
-	}
+    /**
+     * This method sets the value to the member attribute <b>
+     * enricherOptions</b> . You cannot set null to the attribute.
+     *
+     * @param enricherOptions Value to set member attribute <b> enricherOptions</b>
+     */
+    public void setEnricherOptions(String enricherOptions) {
+        this.enricherOptions = enricherOptions;
+    }
 
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	@Override
-	public boolean equals(Object obj) {
-		if (!super.equals(obj)) {
-			return false;
-		}
-		if (this == obj) {
-			return true;
-		}
-		if (!super.equals(obj)) {
-			return false;
-		}
-		if (getClass() != obj.getClass()) {
-			return false;
-		}
-		XXContextEnricherDef other = (XXContextEnricherDef) obj;
-		if (defId == null) {
-			if (other.defId != null) {
-				return false;
-			}
-		} else if (!defId.equals(other.defId)) {
-			return false;
-		}
-		if (itemId == null) {
-			if (other.itemId != null) {
-				return false;
-			}
-		} else if (!itemId.equals(other.itemId)) {
-			return false;
-		}
-		if (enricher == null) {
-			if (other.enricher != null) {
-				return false;
-			}
-		} else if (!enricher.equals(other.enricher)) {
-			return false;
-		}
-		if (enricherOptions == null) {
-			if (other.enricherOptions != null) {
-				return false;
-			}
-		} else if (!enricherOptions.equals(other.enricherOptions)) {
-			return false;
-		}
-		if (id == null) {
-			if (other.id != null) {
-				return false;
-			}
-		} else if (!id.equals(other.id)) {
-			return false;
-		}
-		if (name == null) {
-			if (other.name != null) {
-				return false;
-			}
-		} else if (!name.equals(other.name)) {
-			return false;
-		}
-		if (order == null) {
-			if (other.order != null) {
-				return false;
-			}
-		} else if (!order.equals(other.order)) {
-			return false;
-		}
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see java.lang.Object#toString()
-	 */
-	@Override
-	public String toString() {
-		String str = "XXContextEnricherDef={";
-		str += super.toString();
-		str+=" [id=" + id + ", defId=" + defId + ", itemId=" + itemId
-				+ ", name=" + name + ", enricher=" + enricherOptions
-				+ ", enricherOptions=" + enricherOptions + ", order=" + order
-				+ "]";
-		str += "}";
-		return str;
-	}
+    /**
+     * Returns the value for the member attribute <b>order</b>
+     *
+     * @return Integer - value of member attribute <b>order</b> .
+     */
+    public Integer getOrder() {
+        return this.order;
+    }
 
+    /**
+     * This method sets the value to the member attribute <b> order</b> . You
+     * cannot set null to the attribute.
+     *
+     * @param order Value to set member attribute <b> order</b>
+     */
+    public void setOrder(Integer order) {
+        this.order = order;
+    }
 }
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXCredentialStore.java b/security-admin/src/main/java/org/apache/ranger/entity/XXCredentialStore.java
index cdbf1d8e5..6b11ec062 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXCredentialStore.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXCredentialStore.java
@@ -17,13 +17,14 @@
  * under the License.
  */
 
- package org.apache.ranger.entity;
+package org.apache.ranger.entity;
 
 /**
  * Credential Store
- *
  */
 
+import org.apache.ranger.common.AppConstants;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -32,134 +33,128 @@ import javax.persistence.Id;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 
-import org.apache.ranger.common.AppConstants;
-
-
 @Entity
-@Table(name="x_cred_store")
+@Table(name = "x_cred_store")
 public class XXCredentialStore extends XXDBBase implements java.io.Serializable {
-	private static final long serialVersionUID = 1L;
-
-	@Id
-	@SequenceGenerator(name="X_CRED_STORE_SEQ",sequenceName="X_CRED_STORE_SEQ",allocationSize=1)
-	@GeneratedValue(strategy=GenerationType.AUTO,generator="X_CRED_STORE_SEQ")
-	@Column(name="ID")
-	protected Long id;
-
-	@Override
-	public void setId(Long id) {
-		this.id=id;
-	}
-	@Override
-	public Long getId() {
-		return id;
-	}
-	/**
-	 * Name
-	 * <ul>
-	 * <li>The maximum length for this attribute is <b>1024</b>.
-	 * </ul>
-	 *
-	 */
-	@Column(name="STORE_NAME"  , nullable=false , length=1024)
-	protected String name;
-
-	/**
-	 * Description
-	 * <ul>
-	 * <li>The maximum length for this attribute is <b>4000</b>.
-	 * </ul>
-	 *
-	 */
-	@Column(name="DESCR"  , nullable=false , length=4000)
-	protected String description;
-
-	/**
-	 * Default constructor. This will set all the attributes to default value.
-	 */
-	public XXCredentialStore ( ) {
-	}
-
-	@Override
-	public int getMyClassType( ) {
-	    return AppConstants.CLASS_TYPE_XA_CRED_STORE;
-	}
-
-	@Override
-	public String getMyDisplayValue() {
-		return getDescription( );
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b>name</b>.
-	 * You cannot set null to the attribute.
-	 * @param name Value to set member attribute <b>name</b>
-	 */
-	public void setName( String name ) {
-		this.name = name;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>name</b>
-	 * @return String - value of member attribute <b>name</b>.
-	 */
-	public String getName( ) {
-		return this.name;
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b>description</b>.
-	 * You cannot set null to the attribute.
-	 * @param description Value to set member attribute <b>description</b>
-	 */
-	public void setDescription( String description ) {
-		this.description = description;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>description</b>
-	 * @return String - value of member attribute <b>description</b>.
-	 */
-	public String getDescription( ) {
-		return this.description;
-	}
-
-	/**
-	 * This return the bean content in string format
-	 * @return formatedStr
-	*/
-	@Override
-	public String toString( ) {
-		String str = "XXCredentialStore={";
-		str += super.toString();
-		str += "name={" + name + "} ";
-		str += "description={" + description + "} ";
-		str += "}";
-		return str;
-	}
-
-	/**
-	 * Checks for all attributes except referenced db objects
-	 * @return true if all attributes match
-	*/
-	@Override
-	public boolean equals( Object obj) {
-		if ( !super.equals(obj) ) {
-			return false;
-		}
-		XXCredentialStore other = (XXCredentialStore) obj;
-        	if ((this.name == null && other.name != null) || (this.name != null && !this.name.equals(other.name))) {
-            		return false;
-        	}
-        	if ((this.description == null && other.description != null) || (this.description != null && !this.description.equals(other.description))) {
-            		return false;
-        	}
-		return true;
-	}
-	public static String getEnumName(String fieldName ) {
-		//Later TODO
-		//return super.getEnumName(fieldName);
-		return null;
-	}
-
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @SequenceGenerator(name = "X_CRED_STORE_SEQ", sequenceName = "X_CRED_STORE_SEQ", allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.AUTO, generator = "X_CRED_STORE_SEQ")
+    @Column(name = "ID")
+    protected Long id;
+    /**
+     * Name
+     * <ul>
+     * <li>The maximum length for this attribute is <b>1024</b>.
+     * </ul>
+     *
+     */
+    @Column(name = "STORE_NAME", nullable = false, length = 1024)
+    protected String name;
+    /**
+     * Description
+     * <ul>
+     * <li>The maximum length for this attribute is <b>4000</b>.
+     * </ul>
+     *
+     */
+    @Column(name = "DESCR", nullable = false, length = 4000)
+    protected String description;
+
+    /**
+     * Default constructor. This will set all the attributes to default value.
+     */
+    public XXCredentialStore() {
+    }
+
+    public static String getEnumName(String fieldName) {
+        //Later TODO
+        //return super.getEnumName(fieldName);
+        return null;
+    }
+
+    @Override
+    public int getMyClassType() {
+        return AppConstants.CLASS_TYPE_XA_CRED_STORE;
+    }
+
+    @Override
+    public String getMyDisplayValue() {
+        return getDescription();
+    }
+
+    @Override
+    public Long getId() {
+        return id;
+    }
+
+    @Override
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * Checks for all attributes except referenced db objects
+     * @return true if all attributes match
+     */
+    @Override
+    public boolean equals(Object obj) {
+        if (!super.equals(obj)) {
+            return false;
+        }
+        XXCredentialStore other = (XXCredentialStore) obj;
+        if ((this.name == null && other.name != null) || (this.name != null && !this.name.equals(other.name))) {
+            return false;
+        }
+        return (this.description != null || other.description == null) && (this.description == null || this.description.equals(other.description));
+    }
+
+    /**
+     * This return the bean content in string format
+     * @return formatedStr
+     */
+    @Override
+    public String toString() {
+        String str = "XXCredentialStore={";
+        str += super.toString();
+        str += "name={" + name + "} ";
+        str += "description={" + description + "} ";
+        str += "}";
+        return str;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>name</b>
+     * @return String - value of member attribute <b>name</b>.
+     */
+    public String getName() {
+        return this.name;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b>name</b>.
+     * You cannot set null to the attribute.
+     * @param name Value to set member attribute <b>name</b>
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>description</b>
+     * @return String - value of member attribute <b>description</b>.
+     */
+    public String getDescription() {
+        return this.description;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b>description</b>.
+     * You cannot set null to the attribute.
+     * @param description Value to set member attribute <b>description</b>
+     */
+    public void setDescription(String description) {
+        this.description = description;
+    }
 }
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXDBBase.java b/security-admin/src/main/java/org/apache/ranger/entity/XXDBBase.java
index f70afcee1..e99d10a20 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXDBBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXDBBase.java
@@ -17,15 +17,14 @@
  * under the License.
  */
 
- package org.apache.ranger.entity;
+package org.apache.ranger.entity;
 
 /**
  * Base JPA class with id, versionNumber and other common attributes
- *
  */
 
-import java.util.Date;
-import java.util.Objects;
+import org.apache.ranger.common.AppConstants;
+import org.apache.ranger.common.DateUtil;
 
 import javax.persistence.Column;
 import javax.persistence.EntityListeners;
@@ -33,213 +32,73 @@ import javax.persistence.MappedSuperclass;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 
-import org.apache.ranger.common.AppConstants;
-import org.apache.ranger.common.DateUtil;
-
+import java.util.Date;
+import java.util.Objects;
 
-@MappedSuperclass @EntityListeners( org.apache.ranger.common.db.JPABeanCallbacks.class)
+@MappedSuperclass
+@EntityListeners(org.apache.ranger.common.db.JPABeanCallbacks.class)
 public abstract class XXDBBase implements java.io.Serializable {
-	private static final long serialVersionUID = 1L;
-
-
-
-	/**
-	 * Id for the object
-	 * <ul>
-	 * <li>This attribute is the <b>Primary Key</b> for this class<br>.
-	 * </ul>
-	 *
-	 */
-
-	/**
-	 * Date/Time creation of this user.
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name="CREATE_TIME"   )
-	protected Date createTime = DateUtil.getUTCDate();
-
-	/**
-	 * Date value.
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name="UPDATE_TIME"   )
-	protected Date updateTime = DateUtil.getUTCDate();
-
-	/**
-	 * Added by
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Column(name="ADDED_BY_ID"   )
-	protected Long addedByUserId;
-
-
-	/**
-	 * Last updated by
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Column(name="UPD_BY_ID"   )
-	protected Long updatedByUserId;
-
-
-	/**
-	 * Default constructor. This will set all the attributes to default value.
-	 */
-	public XXDBBase ( ) {
-	}
-
-	public int getMyClassType( ) {
-	    return AppConstants.CLASS_TYPE_NONE;
-	}
-
-	public String getMyDisplayValue() {
-		return null;
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b>id</b>.
-	 * You cannot set null to the attribute.
-	 * @param id Value to set member attribute <b>id</b>
-	 */
-	public abstract void setId( Long id );
-
-	/**
-	 * Returns the value for the member attribute <b>id</b>
-	 * @return Long - value of member attribute <b>id</b>.
-	 */
-	public abstract Long getId( );
-
-	/**
-	 * This method sets the value to the member attribute <b>createTime</b>.
-	 * You cannot set null to the attribute.
-	 * @param createTime Value to set member attribute <b>createTime</b>
-	 */
-	public void setCreateTime( Date createTime ) {
-		this.createTime = createTime;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>createTime</b>
-	 * @return Date - value of member attribute <b>createTime</b>.
-	 */
-	public Date getCreateTime( ) {
-		return this.createTime;
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b>updateTime</b>.
-	 * You cannot set null to the attribute.
-	 * @param updateTime Value to set member attribute <b>updateTime</b>
-	 */
-	public void setUpdateTime( Date updateTime ) {
-		this.updateTime = updateTime;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>updateTime</b>
-	 * @return Date - value of member attribute <b>updateTime</b>.
-	 */
-	public Date getUpdateTime( ) {
-		return this.updateTime;
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b>addedByUserId</b>.
-	 * You cannot set null to the attribute.
-	 * @param addedByUserId Value to set member attribute <b>addedByUserId</b>
-	 */
-	public void setAddedByUserId( Long addedByUserId ) {
-		this.addedByUserId = addedByUserId;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>addedByUserId</b>
-	 * @return Long - value of member attribute <b>addedByUserId</b>.
-	 */
-	public Long getAddedByUserId( ) {
-		return this.addedByUserId;
-	}
-
-
-	/**
-	 * This method sets the value to the member attribute <b>updatedByUserId</b>.
-	 * You cannot set null to the attribute.
-	 * @param updatedByUserId Value to set member attribute <b>updatedByUserId</b>
-	 */
-	public void setUpdatedByUserId( Long updatedByUserId ) {
-		this.updatedByUserId = updatedByUserId;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>updatedByUserId</b>
-	 * @return Long - value of member attribute <b>updatedByUserId</b>.
-	 */
-	public Long getUpdatedByUserId( ) {
-		return this.updatedByUserId;
-	}
-
-
-	/**
-	 * This return the bean content in string format
-	 * @return formatedStr
-	*/
-	@Override
-	public String toString( ) {
-		String str = "XXDBBase={";
-		//`str += "id={" + id + "} ";
-		str += "createTime={" + createTime + "} ";
-		str += "updateTime={" + updateTime + "} ";
-		str += "addedByUserId={" + addedByUserId + "} ";
-		str += "updatedByUserId={" + updatedByUserId + "} ";
-		str += "}";
-		return str;
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(createTime, updateTime, addedByUserId, updatedByUserId);
-	}
-
-	/**
-	 * Checks for all attributes except referenced db objects
-	 * @return true if all attributes match
-	*/
-	@Override
-	public boolean equals( Object obj) {
-		XXDBBase other = (XXDBBase) obj;
-//        	if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) {
-//            		return false;
-//        	}
-        	if ((this.createTime == null && other.createTime != null) || (this.createTime != null && !this.createTime.equals(other.createTime))) {
-            		return false;
-        	}
-        	if ((this.updateTime == null && other.updateTime != null) || (this.updateTime != null && !this.updateTime.equals(other.updateTime))) {
-            		return false;
-        	}
-        	if ((this.addedByUserId == null && other.addedByUserId != null) || (this.addedByUserId != null && !this.addedByUserId.equals(other.addedByUserId))) {
-            		return false;
-        	}
-        	if ((this.updatedByUserId == null && other.updatedByUserId != null) || (this.updatedByUserId != null && !this.updatedByUserId.equals(other.updatedByUserId))) {
-            		return false;
-        	}
-		return true;
-	}
-	public static String getEnumName(String fieldName ) {
-		//Later TODO
-		//return super.getEnumName(fieldName);
-		return null;
-	}
-
-	public static boolean equals(Object object1, Object object2) {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Id for the object
+     * <ul>
+     * <li>This attribute is the <b>Primary Key</b> for this class<br>.
+     * </ul>
+     *
+     */
+
+    /**
+     * Date/Time creation of this user.
+     * <ul>
+     * </ul>
+     *
+     */
+    @Temporal(TemporalType.TIMESTAMP)
+    @Column(name = "CREATE_TIME")
+    protected Date createTime = DateUtil.getUTCDate();
+
+    /**
+     * Date value.
+     * <ul>
+     * </ul>
+     *
+     */
+    @Temporal(TemporalType.TIMESTAMP)
+    @Column(name = "UPDATE_TIME")
+    protected Date updateTime = DateUtil.getUTCDate();
+
+    /**
+     * Added by
+     * <ul>
+     * </ul>
+     *
+     */
+    @Column(name = "ADDED_BY_ID")
+    protected Long addedByUserId;
+
+    /**
+     * Last updated by
+     * <ul>
+     * </ul>
+     *
+     */
+    @Column(name = "UPD_BY_ID")
+    protected Long updatedByUserId;
+
+    /**
+     * Default constructor. This will set all the attributes to default value.
+     */
+    public XXDBBase() {
+    }
+
+    public static String getEnumName(String fieldName) {
+        //Later TODO
+        //return super.getEnumName(fieldName);
+        return null;
+    }
+
+    public static boolean equals(Object object1, Object object2) {
         if (object1 == object2) {
             return true;
         }
@@ -249,4 +108,135 @@ public abstract class XXDBBase implements java.io.Serializable {
         return object1.equals(object2);
     }
 
+    public int getMyClassType() {
+        return AppConstants.CLASS_TYPE_NONE;
+    }
+
+    public String getMyDisplayValue() {
+        return null;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>id</b>
+     * @return Long - value of member attribute <b>id</b>.
+     */
+    public abstract Long getId();
+
+    /**
+     * This method sets the value to the member attribute <b>id</b>.
+     * You cannot set null to the attribute.
+     * @param id Value to set member attribute <b>id</b>
+     */
+    public abstract void setId(Long id);
+
+    /**
+     * Returns the value for the member attribute <b>createTime</b>
+     * @return Date - value of member attribute <b>createTime</b>.
+     */
+    public Date getCreateTime() {
+        return this.createTime;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b>createTime</b>.
+     * You cannot set null to the attribute.
+     * @param createTime Value to set member attribute <b>createTime</b>
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>updateTime</b>
+     * @return Date - value of member attribute <b>updateTime</b>.
+     */
+    public Date getUpdateTime() {
+        return this.updateTime;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b>updateTime</b>.
+     * You cannot set null to the attribute.
+     * @param updateTime Value to set member attribute <b>updateTime</b>
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>addedByUserId</b>
+     * @return Long - value of member attribute <b>addedByUserId</b>.
+     */
+    public Long getAddedByUserId() {
+        return this.addedByUserId;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b>addedByUserId</b>.
+     * You cannot set null to the attribute.
+     * @param addedByUserId Value to set member attribute <b>addedByUserId</b>
+     */
+    public void setAddedByUserId(Long addedByUserId) {
+        this.addedByUserId = addedByUserId;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>updatedByUserId</b>
+     * @return Long - value of member attribute <b>updatedByUserId</b>.
+     */
+    public Long getUpdatedByUserId() {
+        return this.updatedByUserId;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b>updatedByUserId</b>.
+     * You cannot set null to the attribute.
+     * @param updatedByUserId Value to set member attribute <b>updatedByUserId</b>
+     */
+    public void setUpdatedByUserId(Long updatedByUserId) {
+        this.updatedByUserId = updatedByUserId;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(createTime, updateTime, addedByUserId, updatedByUserId);
+    }
+
+    /**
+     * Checks for all attributes except referenced db objects
+     * @return true if all attributes match
+     */
+    @Override
+    public boolean equals(Object obj) {
+        XXDBBase other = (XXDBBase) obj;
+//        	if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) {
+//            		return false;
+//        	}
+        if ((this.createTime == null && other.createTime != null) || (this.createTime != null && !this.createTime.equals(other.createTime))) {
+            return false;
+        }
+        if ((this.updateTime == null && other.updateTime != null) || (this.updateTime != null && !this.updateTime.equals(other.updateTime))) {
+            return false;
+        }
+        if ((this.addedByUserId == null && other.addedByUserId != null) || (this.addedByUserId != null && !this.addedByUserId.equals(other.addedByUserId))) {
+            return false;
+        }
+        return (this.updatedByUserId != null || other.updatedByUserId == null) && (this.updatedByUserId == null || this.updatedByUserId.equals(other.updatedByUserId));
+    }
+
+    /**
+     * This return the bean content in string format
+     * @return formatedStr
+     */
+    @Override
+    public String toString() {
+        String str = "XXDBBase={";
+        //`str += "id={" + id + "} ";
+        str += "createTime={" + createTime + "} ";
+        str += "updateTime={" + updateTime + "} ";
+        str += "addedByUserId={" + addedByUserId + "} ";
+        str += "updatedByUserId={" + updatedByUserId + "} ";
+        str += "}";
+        return str;
+    }
 }
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXDataHist.java b/security-admin/src/main/java/org/apache/ranger/entity/XXDataHist.java
index 216eef2e0..fe35b3946 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXDataHist.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXDataHist.java
@@ -18,455 +18,437 @@
  */
 package org.apache.ranger.entity;
 
-import java.util.Date;
+import org.apache.ranger.common.DateUtil;
 
-import javax.persistence.*;
+import javax.persistence.Cacheable;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
 
-import org.apache.ranger.common.DateUtil;
+import java.util.Date;
 
 @Entity
 @Cacheable
 @Table(name = "x_data_hist")
 public class XXDataHist implements java.io.Serializable {
-	private static final long serialVersionUID = 1L;
-	/**
-	 * id of the XXDataHist
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Id
-	@SequenceGenerator(name = "x_data_hist_SEQ", sequenceName = "x_data_hist_SEQ", allocationSize = 1)
-	@GeneratedValue(strategy = GenerationType.AUTO, generator = "x_data_hist_SEQ")
-	@Column(name = "id")
-	protected Long id;
-
-	/**
-	 * Date/Time creation of this user.
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name = "CREATE_TIME")
-	protected Date createTime = DateUtil.getUTCDate();
-
-	/**
-	 * Date value.
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name = "UPDATE_TIME")
-	protected Date updateTime = DateUtil.getUTCDate();
-
-	/**
-	 * version of the XXDataHist
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Column(name = "version")
-	protected Long version;
-	
-	/**
-	 * type of the XXDataHist
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Column(name = "obj_guid")
-	protected String objectGuid;
-
-	/**
-	 * type of the XXDataHist
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Column(name = "obj_class_type")
-	protected Integer objectClassType;
-
-	/**
-	 * type of the XXDataHist
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Column(name = "obj_id")
-	protected Long objectId;
-
-	/**
-	 * name of the XXDataHist
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Column(name = "obj_name")
-	protected String objectName;
-
-	/**
-	 * action of the XXDataHist
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Column(name = "action")
-	protected String action;
-
-	/**
-	 * fromTime of the XXDataHist
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name = "from_time")
-	protected Date fromTime;
-
-	/**
-	 * toTime of the XXDataHist
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name = "to_time")
-	protected Date toTime;
-
-	/**
-	 * content of the XXDataHist
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Column(name = "content")
-	protected String content;
-
-	/**
-	 * This method sets the value to the member attribute <b> id</b> . You
-	 * cannot set null to the attribute.
-	 *
-	 * @param id
-	 *            Value to set member attribute <b> id</b>
-	 */
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>id</b>
-	 *
-	 * @return Date - value of member attribute <b>id</b> .
-	 */
-	public Long getId() {
-		return this.id;
-	}
-
-	/**
-	 * @return the createTime
-	 */
-	public Date getCreateTime() {
-		return createTime;
-	}
-
-	/**
-	 * @param createTime
-	 *            the createTime to set
-	 */
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-
-	/**
-	 * @return the updateTime
-	 */
-	public Date getUpdateTime() {
-		return updateTime;
-	}
-
-	/**
-	 * @param updateTime
-	 *            the updateTime to set
-	 */
-	public void setUpdateTime(Date updateTime) {
-		this.updateTime = updateTime;
-	}
-	
-	/**
-	 * Returns the value for the member attribute <b>version</b>
-	 *
-	 * @return Date - value of member attribute <b>version</b> .
-	 */
-	public Long getVersion() {
-		return this.version;
-	}
-	
-	/**
-	 * This method sets the value to the member attribute <b> version</b> . You
-	 * cannot set null to the attribute.
-	 *
-	 * @param version
-	 *            Value to set member attribute <b> version</b>
-	 */
-	public void setVersion(Long version) {
-		this.version = version;
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b> action</b> . You
-	 * cannot set null to the attribute.
-	 *
-	 * @param action
-	 *            Value to set member attribute <b> action</b>
-	 */
-	public void setAction(String action) {
-		this.action = action;
-	}
-
-	/**
-	 * @return the objectGuid
-	 */
-	public String getObjectGuid() {
-		return objectGuid;
-	}
-
-	/**
-	 * @param objectGuid the objectGuid to set
-	 */
-	public void setObjectGuid(String objectGuid) {
-		this.objectGuid = objectGuid;
-	}
-
-	/**
-	 * @return the objectId
-	 */
-	public Long getObjectId() {
-		return objectId;
-	}
-
-	/**
-	 * @param objectId the objectId to set
-	 */
-	public void setObjectId(Long objectId) {
-		this.objectId = objectId;
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b> type</b> . You
-	 * cannot set null to the attribute.
-	 *
-	 * @param objectClassType
-	 *            Value to set member attribute <b> type</b>
-	 */
-	public void setObjectClassType(Integer objectClassType) {
-		this.objectClassType = objectClassType;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>type</b>
-	 *
-	 * @return Date - value of member attribute <b>type</b> .
-	 */
-	public Integer getObjectClassType() {
-		return this.objectClassType;
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b> name</b> . You
-	 * cannot set null to the attribute.
-	 *
-	 * @param name
-	 *            Value to set member attribute <b> name</b>
-	 */
-	public void setObjectName(String name) {
-		this.objectName = name;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>name</b>
-	 *
-	 * @return Date - value of member attribute <b>name</b> .
-	 */
-	public String getObjectName() {
-		return this.objectName;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>action</b>
-	 *
-	 * @return Date - value of member attribute <b>action</b> .
-	 */
-	public String getAction() {
-		return this.action;
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b> fromTime</b> . You
-	 * cannot set null to the attribute.
-	 *
-	 * @param fromTime
-	 *            Value to set member attribute <b> fromTime</b>
-	 */
-	public void setFromTime(Date fromTime) {
-		this.fromTime = fromTime;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>fromTime</b>
-	 *
-	 * @return Date - value of member attribute <b>fromTime</b> .
-	 */
-	public Date getFromTime() {
-		return this.fromTime;
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b> toTime</b> . You
-	 * cannot set null to the attribute.
-	 *
-	 * @param toTime
-	 *            Value to set member attribute <b> toTime</b>
-	 */
-	public void setToTime(Date toTime) {
-		this.toTime = toTime;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>toTime</b>
-	 *
-	 * @return Date - value of member attribute <b>toTime</b> .
-	 */
-	public Date getToTime() {
-		return this.toTime;
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b> content</b> . You
-	 * cannot set null to the attribute.
-	 *
-	 * @param content
-	 *            Value to set member attribute <b> content</b>
-	 */
-	public void setContent(String content) {
-		this.content = content;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>content</b>
-	 *
-	 * @return Date - value of member attribute <b>content</b> .
-	 */
-	public String getContent() {
-		return this.content;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	@Override
-	public boolean equals(Object obj) {
-		if ( !super.equals(obj) ) {
-			return false;
-		}
-		if (this == obj) {
-			return true;
-		}
-		if (obj == null) {
-			return false;
-		}
-		if (getClass() != obj.getClass()) {
-			return false;
-		}
-		XXDataHist other = (XXDataHist) obj;
-		if (action == null) {
-			if (other.action != null) {
-				return false;
-			}
-		} else if (!action.equals(other.action)) {
-			return false;
-		}
-		if (content == null) {
-			if (other.content != null) {
-				return false;
-			}
-		} else if (!content.equals(other.content)) {
-			return false;
-		}
-		if (createTime == null) {
-			if (other.createTime != null) {
-				return false;
-			}
-		} else if (!createTime.equals(other.createTime)) {
-			return false;
-		}
-		if (fromTime == null) {
-			if (other.fromTime != null) {
-				return false;
-			}
-		} else if (!fromTime.equals(other.fromTime)) {
-			return false;
-		}
-		if (id == null) {
-			if (other.id != null) {
-				return false;
-			}
-		} else if (!id.equals(other.id)) {
-			return false;
-		}
-		if (objectName == null) {
-			if (other.objectName != null) {
-				return false;
-			}
-		} else if (!objectName.equals(other.objectName)) {
-			return false;
-		}
-		if (toTime == null) {
-			if (other.toTime != null) {
-				return false;
-			}
-		} else if (!toTime.equals(other.toTime)) {
-			return false;
-		}
-		if (objectClassType == null) {
-			if (other.objectClassType != null) {
-				return false;
-			}
-		} else if (!objectClassType.equals(other.objectClassType)) {
-			return false;
-		}
-		if (updateTime == null) {
-			if (other.updateTime != null) {
-				return false;
-			}
-		} else if (!updateTime.equals(other.updateTime)) {
-			return false;
-		}
-		if (version == null) {
-			if (other.version != null) {
-				return false;
-			}
-		} else if (!version.equals(other.version)) {
-			return false;
-		}
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see java.lang.Object#toString()
-	 */
-	@Override
-	public String toString() {
-		return "XXDataHist [id=" + id + ", createTime=" + createTime
-				+ ", updateTime=" + updateTime + ", type=" + objectClassType + ", name="
-				+ objectName + ", version=" + version + ", action=" + action
-				+ ", fromTime=" + fromTime + ", toTime=" + toTime
-				+ ", content=" + content + "]";
-	}
-
+    private static final long serialVersionUID = 1L;
+    /**
+     * id of the XXDataHist
+     * <ul>
+     * </ul>
+     */
+    @Id
+    @SequenceGenerator(name = "x_data_hist_SEQ", sequenceName = "x_data_hist_SEQ", allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.AUTO, generator = "x_data_hist_SEQ")
+    @Column(name = "id")
+    protected            Long id;
+
+    /**
+     * Date/Time creation of this user.
+     * <ul>
+     * </ul>
+     */
+    @Temporal(TemporalType.TIMESTAMP)
+    @Column(name = "CREATE_TIME")
+    protected Date createTime = DateUtil.getUTCDate();
+
+    /**
+     * Date value.
+     * <ul>
+     * </ul>
+     */
+    @Temporal(TemporalType.TIMESTAMP)
+    @Column(name = "UPDATE_TIME")
+    protected Date updateTime = DateUtil.getUTCDate();
+
+    /**
+     * version of the XXDataHist
+     * <ul>
+     * </ul>
+     */
+    @Column(name = "version")
+    protected Long version;
+
+    /**
+     * type of the XXDataHist
+     * <ul>
+     * </ul>
+     */
+    @Column(name = "obj_guid")
+    protected String objectGuid;
+
+    /**
+     * type of the XXDataHist
+     * <ul>
+     * </ul>
+     */
+    @Column(name = "obj_class_type")
+    protected Integer objectClassType;
+
+    /**
+     * type of the XXDataHist
+     * <ul>
+     * </ul>
+     */
+    @Column(name = "obj_id")
+    protected Long objectId;
+
+    /**
+     * name of the XXDataHist
+     * <ul>
+     * </ul>
+     */
+    @Column(name = "obj_name")
+    protected String objectName;
+
+    /**
+     * action of the XXDataHist
+     * <ul>
+     * </ul>
+     */
+    @Column(name = "action")
+    protected String action;
+
+    /**
+     * fromTime of the XXDataHist
+     * <ul>
+     * </ul>
+     */
+    @Temporal(TemporalType.TIMESTAMP)
+    @Column(name = "from_time")
+    protected Date fromTime;
+
+    /**
+     * toTime of the XXDataHist
+     * <ul>
+     * </ul>
+     */
+    @Temporal(TemporalType.TIMESTAMP)
+    @Column(name = "to_time")
+    protected Date toTime;
+
+    /**
+     * content of the XXDataHist
+     * <ul>
+     * </ul>
+     */
+    @Column(name = "content")
+    protected String content;
+
+    /**
+     * Returns the value for the member attribute <b>id</b>
+     *
+     * @return Date - value of member attribute <b>id</b> .
+     */
+    public Long getId() {
+        return this.id;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b> id</b> . You
+     * cannot set null to the attribute.
+     *
+     * @param id Value to set member attribute <b> id</b>
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * @return the createTime
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * @param createTime the createTime to set
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * @return the updateTime
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * @param updateTime the updateTime to set
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>version</b>
+     *
+     * @return Date - value of member attribute <b>version</b> .
+     */
+    public Long getVersion() {
+        return this.version;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b> version</b> . You
+     * cannot set null to the attribute.
+     *
+     * @param version Value to set member attribute <b> version</b>
+     */
+    public void setVersion(Long version) {
+        this.version = version;
+    }
+
+    /**
+     * @return the objectGuid
+     */
+    public String getObjectGuid() {
+        return objectGuid;
+    }
+
+    /**
+     * @param objectGuid the objectGuid to set
+     */
+    public void setObjectGuid(String objectGuid) {
+        this.objectGuid = objectGuid;
+    }
+
+    /**
+     * @return the objectId
+     */
+    public Long getObjectId() {
+        return objectId;
+    }
+
+    /**
+     * @param objectId the objectId to set
+     */
+    public void setObjectId(Long objectId) {
+        this.objectId = objectId;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>type</b>
+     *
+     * @return Date - value of member attribute <b>type</b> .
+     */
+    public Integer getObjectClassType() {
+        return this.objectClassType;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b> type</b> . You
+     * cannot set null to the attribute.
+     *
+     * @param objectClassType Value to set member attribute <b> type</b>
+     */
+    public void setObjectClassType(Integer objectClassType) {
+        this.objectClassType = objectClassType;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>name</b>
+     *
+     * @return Date - value of member attribute <b>name</b> .
+     */
+    public String getObjectName() {
+        return this.objectName;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b> name</b> . You
+     * cannot set null to the attribute.
+     *
+     * @param name Value to set member attribute <b> name</b>
+     */
+    public void setObjectName(String name) {
+        this.objectName = name;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>action</b>
+     *
+     * @return Date - value of member attribute <b>action</b> .
+     */
+    public String getAction() {
+        return this.action;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b> action</b> . You
+     * cannot set null to the attribute.
+     *
+     * @param action Value to set member attribute <b> action</b>
+     */
+    public void setAction(String action) {
+        this.action = action;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>fromTime</b>
+     *
+     * @return Date - value of member attribute <b>fromTime</b> .
+     */
+    public Date getFromTime() {
+        return this.fromTime;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b> fromTime</b> . You
+     * cannot set null to the attribute.
+     *
+     * @param fromTime Value to set member attribute <b> fromTime</b>
+     */
+    public void setFromTime(Date fromTime) {
+        this.fromTime = fromTime;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>toTime</b>
+     *
+     * @return Date - value of member attribute <b>toTime</b> .
+     */
+    public Date getToTime() {
+        return this.toTime;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b> toTime</b> . You
+     * cannot set null to the attribute.
+     *
+     * @param toTime Value to set member attribute <b> toTime</b>
+     */
+    public void setToTime(Date toTime) {
+        this.toTime = toTime;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>content</b>
+     *
+     * @return Date - value of member attribute <b>content</b> .
+     */
+    public String getContent() {
+        return this.content;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b> content</b> . You
+     * cannot set null to the attribute.
+     *
+     * @param content Value to set member attribute <b> content</b>
+     */
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see java.lang.Object#equals(java.lang.Object)
+     */
+    @Override
+    public boolean equals(Object obj) {
+        if (!super.equals(obj)) {
+            return false;
+        }
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        XXDataHist other = (XXDataHist) obj;
+        if (action == null) {
+            if (other.action != null) {
+                return false;
+            }
+        } else if (!action.equals(other.action)) {
+            return false;
+        }
+        if (content == null) {
+            if (other.content != null) {
+                return false;
+            }
+        } else if (!content.equals(other.content)) {
+            return false;
+        }
+        if (createTime == null) {
+            if (other.createTime != null) {
+                return false;
+            }
+        } else if (!createTime.equals(other.createTime)) {
+            return false;
+        }
+        if (fromTime == null) {
+            if (other.fromTime != null) {
+                return false;
+            }
+        } else if (!fromTime.equals(other.fromTime)) {
+            return false;
+        }
+        if (id == null) {
+            if (other.id != null) {
+                return false;
+            }
+        } else if (!id.equals(other.id)) {
+            return false;
+        }
+        if (objectName == null) {
+            if (other.objectName != null) {
+                return false;
+            }
+        } else if (!objectName.equals(other.objectName)) {
+            return false;
+        }
+        if (toTime == null) {
+            if (other.toTime != null) {
+                return false;
+            }
+        } else if (!toTime.equals(other.toTime)) {
+            return false;
+        }
+        if (objectClassType == null) {
+            if (other.objectClassType != null) {
+                return false;
+            }
+        } else if (!objectClassType.equals(other.objectClassType)) {
+            return false;
+        }
+        if (updateTime == null) {
+            if (other.updateTime != null) {
+                return false;
+            }
+        } else if (!updateTime.equals(other.updateTime)) {
+            return false;
+        }
+        if (version == null) {
+            return other.version == null;
+        } else
+            return version.equals(other.version);
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        return "XXDataHist [id=" + id + ", createTime=" + createTime
+                + ", updateTime=" + updateTime + ", type=" + objectClassType + ", name="
+                + objectName + ", version=" + version + ", action=" + action
+                + ", fromTime=" + fromTime + ", toTime=" + toTime
+                + ", content=" + content + "]";
+    }
 }
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXDataMaskTypeDef.java b/security-admin/src/main/java/org/apache/ranger/entity/XXDataMaskTypeDef.java
index bc893f3d9..4492e3aaa 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXDataMaskTypeDef.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXDataMaskTypeDef.java
@@ -18,441 +18,422 @@
  */
 package org.apache.ranger.entity;
 
-import javax.persistence.*;
+import javax.persistence.Cacheable;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
 
 @Entity
 @Cacheable
 @Table(name = "x_datamask_type_def")
 public class XXDataMaskTypeDef extends XXDBBase implements java.io.Serializable {
-	private static final long serialVersionUID = 1L;
-	/**
-	 * id of the XXDataMaskTypeDef
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Id
-	@SequenceGenerator(name = "x_datamask_type_def_SEQ", sequenceName = "x_datamask_type_def_SEQ", allocationSize = 1)
-	@GeneratedValue(strategy = GenerationType.AUTO, generator = "x_datamask_type_def_SEQ")
-	@Column(name = "id")
-	protected Long id;
-
-	/**
-	 * defId of the XXDataMaskTypeDef
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Column(name = "def_id")
-	protected Long defId;
-
-	/**
-	 * itemId of the XXDataMaskTypeDef
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Column(name = "item_id")
-	protected Long itemId;
-
-	/**
-	 * name of the XXDataMaskTypeDef
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Column(name = "name")
-	protected String name;
-
-	/**
-	 * label of the XXDataMaskTypeDef
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Column(name = "label")
-	protected String label;
-
-	/**
-	 * description of the XXDataMaskTypeDef
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Column(name = "description")
-	protected String description;
-
-	/**
-	 * transformer of the XXDataMaskTypeDef
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Column(name = "transformer")
-	protected String transformer;
-
-	/**
-	 * dataMaskOptions of the XXDataMaskTypeDef
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Column(name = "datamask_options")
-	protected String dataMaskOptions;
-
-	/**
-	 * rbKeyLabel of the XXDataMaskTypeDef
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Column(name = "rb_key_label")
-	protected String rbKeyLabel;
-
-	/**
-	 * rbKeyDescription of the XXDataMaskTypeDef
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Column(name = "rb_key_description")
-	protected String rbKeyDescription;
-
-	/**
-	 * order of the XXDataMaskTypeDef
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Column(name = "sort_order")
-	protected Integer order;
-
-	/**
-	 * This method sets the value to the member attribute <b> id</b> . You
-	 * cannot set null to the attribute.
-	 *
-	 * @param id
-	 *            Value to set member attribute <b> id</b>
-	 */
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>id</b>
-	 *
-	 * @return Date - value of member attribute <b>id</b> .
-	 */
-	public Long getId() {
-		return this.id;
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b> defId</b> . You
-	 * cannot set null to the attribute.
-	 *
-	 * @param defId
-	 *            Value to set member attribute <b> defId</b>
-	 */
-	public void setDefid(Long defId) {
-		this.defId = defId;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>defId</b>
-	 *
-	 * @return Date - value of member attribute <b>defId</b> .
-	 */
-	public Long getDefid() {
-		return this.defId;
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b> itemId</b> . You
-	 * cannot set null to the attribute.
-	 *
-	 * @param itemId
-	 *            Value to set member attribute <b> itemId</b>
-	 */
-	public void setItemId(Long itemId) {
-		this.itemId = itemId;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>itemId</b>
-	 *
-	 * @return Long - value of member attribute <b>itemId</b> .
-	 */
-	public Long getItemId() {
-		return this.itemId;
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b> name</b> . You
-	 * cannot set null to the attribute.
-	 *
-	 * @param name
-	 *            Value to set member attribute <b> name</b>
-	 */
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>name</b>
-	 *
-	 * @return Date - value of member attribute <b>name</b> .
-	 */
-	public String getName() {
-		return this.name;
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b> label</b> . You
-	 * cannot set null to the attribute.
-	 *
-	 * @param label
-	 *            Value to set member attribute <b> label</b>
-	 */
-	public void setLabel(String label) {
-		this.label = label;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>label</b>
-	 *
-	 * @return Date - value of member attribute <b>label</b> .
-	 */
-	public String getLabel() {
-		return this.label;
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b> description</b> .
-	 *
-	 * @param description
-	 *            Value to set member attribute <b> description</b>
-	 */
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>description</b>
-	 *
-	 * @return String - value of member attribute <b>description</b> .
-	 */
-	public String getDescription() {
-		return this.description;
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b> transformer</b> .
-	 *
-	 * @param transformer
-	 *            Value to set member attribute <b> transformer</b>
-	 */
-	public void setTransformer(String transformer) {
-		this.transformer = transformer;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>transformer</b>
-	 *
-	 * @return String - value of member attribute <b>transformer</b> .
-	 */
-	public String getTransformer() {
-		return this.transformer;
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b> dataMaskOptions</b> .
-	 *
-	 * @param dataMaskOptions
-	 *            Value to set member attribute <b> dataMaskOptions</b>
-	 */
-	public void setDataMaskOptions(String dataMaskOptions) {
-		this.dataMaskOptions = dataMaskOptions;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>dataMaskOptions</b>
-	 *
-	 * @return String - value of member attribute <b>dataMaskOptions</b> .
-	 */
-	public String getDataMaskOptions() {
-		return this.dataMaskOptions;
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b> rbKeyLabel</b> .
-	 * You cannot set null to the attribute.
-	 *
-	 * @param rbKeyLabel
-	 *            Value to set member attribute <b> rbKeyLabel</b>
-	 */
-	public void setRbkeylabel(String rbKeyLabel) {
-		this.rbKeyLabel = rbKeyLabel;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>rbKeyLabel</b>
-	 *
-	 * @return Date - value of member attribute <b>rbKeyLabel</b> .
-	 */
-	public String getRbkeylabel() {
-		return this.rbKeyLabel;
-	}
-	/**
-	 * This method sets the value to the member attribute <b> rbKeyDescription</b> .
-	 *
-	 * @param rbKeyDescription
-	 *            Value to set member attribute <b> rbKeyDescription</b>
-	 */
-	public void setRbKeyDescription(String rbKeyDescription) {
-		this.rbKeyDescription = rbKeyDescription;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>rbKeyDescription</b>
-	 *
-	 * @return String - value of member attribute <b>rbKeyDescription</b> .
-	 */
-	public String getRbKeyDescription() {
-		return this.rbKeyDescription;
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b> order</b> . You
-	 * cannot set null to the attribute.
-	 *
-	 * @param order
-	 *            Value to set member attribute <b> order</b>
-	 */
-	public void setOrder(Integer order) {
-		this.order = order;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>order</b>
-	 *
-	 * @return Date - value of member attribute <b>order</b> .
-	 */
-	public Integer getOrder() {
-		return this.order;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	@Override
-	public boolean equals(Object obj) {
-		if (!super.equals(obj)) {
-			return false;
-		}
-		if (this == obj) {
-			return true;
-		}
-		if (!super.equals(obj)) {
-			return false;
-		}
-		if (getClass() != obj.getClass()) {
-			return false;
-		}
-		XXDataMaskTypeDef other = (XXDataMaskTypeDef) obj;
-		if (id == null) {
-			if (other.id != null) {
-				return false;
-			}
-		} else if (!id.equals(other.id)) {
-			return false;
-		}
-		if (defId == null) {
-			if (other.defId != null) {
-				return false;
-			}
-		} else if (!defId.equals(other.defId)) {
-			return false;
-		}
-		if (itemId == null) {
-			if (other.itemId != null) {
-				return false;
-			}
-		} else if (!itemId.equals(other.itemId)) {
-			return false;
-		}
-		if (name == null) {
-			if (other.name != null) {
-				return false;
-			}
-		} else if (!name.equals(other.name)) {
-			return false;
-		}
-		if (label == null) {
-			if (other.label != null) {
-				return false;
-			}
-		} else if (!label.equals(other.label)) {
-			return false;
-		}
-		if (description == null) {
-			if (other.description != null) {
-				return false;
-			}
-		} else if (!description.equals(other.description)) {
-			return false;
-		}
-		if (transformer == null) {
-			if (other.transformer != null) {
-				return false;
-			}
-		} else if (!transformer.equals(other.transformer)) {
-			return false;
-		}
-		if (dataMaskOptions == null) {
-			if (other.dataMaskOptions != null) {
-				return false;
-			}
-		} else if (!dataMaskOptions.equals(other.dataMaskOptions)) {
-			return false;
-		}
-		if (rbKeyLabel == null) {
-			if (other.rbKeyLabel != null) {
-				return false;
-			}
-		} else if (!rbKeyLabel.equals(other.rbKeyLabel)) {
-			return false;
-		}
-		if (rbKeyDescription == null) {
-			if (other.rbKeyDescription != null) {
-				return false;
-			}
-		} else if (!rbKeyDescription.equals(other.rbKeyDescription)) {
-			return false;
-		}
-		if (order == null) {
-			if (other.order != null) {
-				return false;
-			}
-		} else if (!order.equals(other.order)) {
-			return false;
-		}
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see java.lang.Object#toString()
-	 */
-	@Override
-	public String toString() {
-		return "XXDataMaskTypeDef [" + super.toString() + " id=" + id
-				+ ", defId=" + defId + ", itemId=" + itemId + ", name=" + name + ", label=" + label
-				+ ", description=" + description + ", transformer=" + transformer + ", dataMaskOptions=" + dataMaskOptions
-				+ ", rbKeyLabel=" + rbKeyLabel + ", rbKeyDescription=" + rbKeyDescription + ", order=" + order + "]";
-	}
-
+    private static final long serialVersionUID = 1L;
+    /**
+     * id of the XXDataMaskTypeDef
+     * <ul>
+     * </ul>
+     */
+    @Id
+    @SequenceGenerator(name = "x_datamask_type_def_SEQ", sequenceName = "x_datamask_type_def_SEQ", allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.AUTO, generator = "x_datamask_type_def_SEQ")
+    @Column(name = "id")
+    protected            Long id;
+
+    /**
+     * defId of the XXDataMaskTypeDef
+     * <ul>
+     * </ul>
+     */
+    @Column(name = "def_id")
+    protected Long defId;
+
+    /**
+     * itemId of the XXDataMaskTypeDef
+     * <ul>
+     * </ul>
+     */
+    @Column(name = "item_id")
+    protected Long itemId;
+
+    /**
+     * name of the XXDataMaskTypeDef
+     * <ul>
+     * </ul>
+     */
+    @Column(name = "name")
+    protected String name;
+
+    /**
+     * label of the XXDataMaskTypeDef
+     * <ul>
+     * </ul>
+     */
+    @Column(name = "label")
+    protected String label;
+
+    /**
+     * description of the XXDataMaskTypeDef
+     * <ul>
+     * </ul>
+     */
+    @Column(name = "description")
+    protected String description;
+
+    /**
+     * transformer of the XXDataMaskTypeDef
+     * <ul>
+     * </ul>
+     */
+    @Column(name = "transformer")
+    protected String transformer;
+
+    /**
+     * dataMaskOptions of the XXDataMaskTypeDef
+     * <ul>
+     * </ul>
+     */
+    @Column(name = "datamask_options")
+    protected String dataMaskOptions;
+
+    /**
+     * rbKeyLabel of the XXDataMaskTypeDef
+     * <ul>
+     * </ul>
+     */
+    @Column(name = "rb_key_label")
+    protected String rbKeyLabel;
+
+    /**
+     * rbKeyDescription of the XXDataMaskTypeDef
+     * <ul>
+     * </ul>
+     */
+    @Column(name = "rb_key_description")
+    protected String rbKeyDescription;
+
+    /**
+     * order of the XXDataMaskTypeDef
+     * <ul>
+     * </ul>
+     */
+    @Column(name = "sort_order")
+    protected Integer order;
+
+    /**
+     * Returns the value for the member attribute <b>id</b>
+     *
+     * @return Date - value of member attribute <b>id</b> .
+     */
+    public Long getId() {
+        return this.id;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b> id</b> . You
+     * cannot set null to the attribute.
+     *
+     * @param id Value to set member attribute <b> id</b>
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see java.lang.Object#equals(java.lang.Object)
+     */
+    @Override
+    public boolean equals(Object obj) {
+        if (!super.equals(obj)) {
+            return false;
+        }
+        if (this == obj) {
+            return true;
+        }
+        if (!super.equals(obj)) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        XXDataMaskTypeDef other = (XXDataMaskTypeDef) obj;
+        if (id == null) {
+            if (other.id != null) {
+                return false;
+            }
+        } else if (!id.equals(other.id)) {
+            return false;
+        }
+        if (defId == null) {
+            if (other.defId != null) {
+                return false;
+            }
+        } else if (!defId.equals(other.defId)) {
+            return false;
+        }
+        if (itemId == null) {
+            if (other.itemId != null) {
+                return false;
+            }
+        } else if (!itemId.equals(other.itemId)) {
+            return false;
+        }
+        if (name == null) {
+            if (other.name != null) {
+                return false;
+            }
+        } else if (!name.equals(other.name)) {
+            return false;
+        }
+        if (label == null) {
+            if (other.label != null) {
+                return false;
+            }
+        } else if (!label.equals(other.label)) {
+            return false;
+        }
+        if (description == null) {
+            if (other.description != null) {
+                return false;
+            }
+        } else if (!description.equals(other.description)) {
+            return false;
+        }
+        if (transformer == null) {
+            if (other.transformer != null) {
+                return false;
+            }
+        } else if (!transformer.equals(other.transformer)) {
+            return false;
+        }
+        if (dataMaskOptions == null) {
+            if (other.dataMaskOptions != null) {
+                return false;
+            }
+        } else if (!dataMaskOptions.equals(other.dataMaskOptions)) {
+            return false;
+        }
+        if (rbKeyLabel == null) {
+            if (other.rbKeyLabel != null) {
+                return false;
+            }
+        } else if (!rbKeyLabel.equals(other.rbKeyLabel)) {
+            return false;
+        }
+        if (rbKeyDescription == null) {
+            if (other.rbKeyDescription != null) {
+                return false;
+            }
+        } else if (!rbKeyDescription.equals(other.rbKeyDescription)) {
+            return false;
+        }
+        if (order == null) {
+            return other.order == null;
+        } else
+            return order.equals(other.order);
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        return "XXDataMaskTypeDef [" + super.toString() + " id=" + id
+                + ", defId=" + defId + ", itemId=" + itemId + ", name=" + name + ", label=" + label
+                + ", description=" + description + ", transformer=" + transformer + ", dataMaskOptions=" + dataMaskOptions
+                + ", rbKeyLabel=" + rbKeyLabel + ", rbKeyDescription=" + rbKeyDescription + ", order=" + order + "]";
+    }
+
+    /**
+     * Returns the value for the member attribute <b>defId</b>
+     *
+     * @return Date - value of member attribute <b>defId</b> .
+     */
+    public Long getDefid() {
+        return this.defId;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b> defId</b> . You
+     * cannot set null to the attribute.
+     *
+     * @param defId Value to set member attribute <b> defId</b>
+     */
+    public void setDefid(Long defId) {
+        this.defId = defId;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>itemId</b>
+     *
+     * @return Long - value of member attribute <b>itemId</b> .
+     */
+    public Long getItemId() {
+        return this.itemId;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b> itemId</b> . You
+     * cannot set null to the attribute.
+     *
+     * @param itemId Value to set member attribute <b> itemId</b>
+     */
+    public void setItemId(Long itemId) {
+        this.itemId = itemId;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>name</b>
+     *
+     * @return Date - value of member attribute <b>name</b> .
+     */
+    public String getName() {
+        return this.name;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b> name</b> . You
+     * cannot set null to the attribute.
+     *
+     * @param name Value to set member attribute <b> name</b>
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>label</b>
+     *
+     * @return Date - value of member attribute <b>label</b> .
+     */
+    public String getLabel() {
+        return this.label;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b> label</b> . You
+     * cannot set null to the attribute.
+     *
+     * @param label Value to set member attribute <b> label</b>
+     */
+    public void setLabel(String label) {
+        this.label = label;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>description</b>
+     *
+     * @return String - value of member attribute <b>description</b> .
+     */
+    public String getDescription() {
+        return this.description;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b> description</b> .
+     *
+     * @param description Value to set member attribute <b> description</b>
+     */
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>transformer</b>
+     *
+     * @return String - value of member attribute <b>transformer</b> .
+     */
+    public String getTransformer() {
+        return this.transformer;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b> transformer</b> .
+     *
+     * @param transformer Value to set member attribute <b> transformer</b>
+     */
+    public void setTransformer(String transformer) {
+        this.transformer = transformer;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>dataMaskOptions</b>
+     *
+     * @return String - value of member attribute <b>dataMaskOptions</b> .
+     */
+    public String getDataMaskOptions() {
+        return this.dataMaskOptions;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b> dataMaskOptions</b> .
+     *
+     * @param dataMaskOptions Value to set member attribute <b> dataMaskOptions</b>
+     */
+    public void setDataMaskOptions(String dataMaskOptions) {
+        this.dataMaskOptions = dataMaskOptions;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>rbKeyLabel</b>
+     *
+     * @return Date - value of member attribute <b>rbKeyLabel</b> .
+     */
+    public String getRbkeylabel() {
+        return this.rbKeyLabel;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b> rbKeyLabel</b> .
+     * You cannot set null to the attribute.
+     *
+     * @param rbKeyLabel Value to set member attribute <b> rbKeyLabel</b>
+     */
+    public void setRbkeylabel(String rbKeyLabel) {
+        this.rbKeyLabel = rbKeyLabel;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>rbKeyDescription</b>
+     *
+     * @return String - value of member attribute <b>rbKeyDescription</b> .
+     */
+    public String getRbKeyDescription() {
+        return this.rbKeyDescription;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b> rbKeyDescription</b> .
+     *
+     * @param rbKeyDescription Value to set member attribute <b> rbKeyDescription</b>
+     */
+    public void setRbKeyDescription(String rbKeyDescription) {
+        this.rbKeyDescription = rbKeyDescription;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>order</b>
+     *
+     * @return Date - value of member attribute <b>order</b> .
+     */
+    public Integer getOrder() {
+        return this.order;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b> order</b> . You
+     * cannot set null to the attribute.
+     *
+     * @param order Value to set member attribute <b> order</b>
+     */
+    public void setOrder(Integer order) {
+        this.order = order;
+    }
 }
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXEnumDef.java b/security-admin/src/main/java/org/apache/ranger/entity/XXEnumDef.java
index a5806630e..b7d5daa4d 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXEnumDef.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXEnumDef.java
@@ -18,229 +18,221 @@
  */
 package org.apache.ranger.entity;
 
-import javax.persistence.*;
+import javax.persistence.Cacheable;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
 
 @Entity
 @Cacheable
 @Table(name = "x_enum_def")
 public class XXEnumDef extends XXDBBase implements java.io.Serializable {
-	private static final long serialVersionUID = 1L;
-	/**
-	 * id of the XXEnumDef
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Id
-	@SequenceGenerator(name = "x_enum_def_SEQ", sequenceName = "x_enum_def_SEQ", allocationSize = 1)
-	@GeneratedValue(strategy = GenerationType.AUTO, generator = "x_enum_def_SEQ")
-	@Column(name = "id")
-	protected Long id;
-
-	/**
-	 * defId of the XXEnumDef
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Column(name = "def_id")
-	protected Long defId;
-
-	/**
-	 * itemId of the XXEnumDef
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Column(name = "item_id")
-	protected Long itemId;
-
-	/**
-	 * name of the XXEnumDef
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Column(name = "name")
-	protected String name;
-
-	/**
-	 * defaultIndex of the XXEnumDef
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Column(name = "default_index")
-	protected Integer defaultIndex;
-
-	/**
-	 * This method sets the value to the member attribute <b> id</b> . You
-	 * cannot set null to the attribute.
-	 *
-	 * @param id
-	 *            Value to set member attribute <b> id</b>
-	 */
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>id</b>
-	 *
-	 * @return Date - value of member attribute <b>id</b> .
-	 */
-	public Long getId() {
-		return this.id;
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b> defId</b> . You
-	 * cannot set null to the attribute.
-	 *
-	 * @param defId
-	 *            Value to set member attribute <b> defId</b>
-	 */
-	public void setDefid(Long defId) {
-		this.defId = defId;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>defId</b>
-	 *
-	 * @return Date - value of member attribute <b>defId</b> .
-	 */
-	public Long getDefid() {
-		return this.defId;
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b> itemId</b> . You
-	 * cannot set null to the attribute.
-	 *
-	 * @param defId
-	 *            Value to set member attribute <b> itemId</b>
-	 */
-	public void setItemId(Long itemId) {
-		this.itemId = itemId;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>itemId</b>
-	 *
-	 * @return Long - value of member attribute <b>itemId</b> .
-	 */
-	public Long getItemId() {
-		return this.itemId;
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b> name</b> . You
-	 * cannot set null to the attribute.
-	 *
-	 * @param name
-	 *            Value to set member attribute <b> name</b>
-	 */
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>name</b>
-	 *
-	 * @return Date - value of member attribute <b>name</b> .
-	 */
-	public String getName() {
-		return this.name;
-	}
-
-	/**
-	 * This method sets the value to the member attribute <b> defaultIndex</b> .
-	 * You cannot set null to the attribute.
-	 *
-	 * @param defaultIndex
-	 *            Value to set member attribute <b> defaultIndex</b>
-	 */
-	public void setDefaultindex(Integer defaultIndex) {
-		this.defaultIndex = defaultIndex;
-	}
-
-	/**
-	 * Returns the value for the member attribute <b>defaultIndex</b>
-	 *
-	 * @return Date - value of member attribute <b>defaultIndex</b> .
-	 */
-	public Integer getDefaultindex() {
-		return this.defaultIndex;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	@Override
-	public boolean equals(Object obj) {
-		if (!super.equals(obj)) {
-			return false;
-		}
-		if (this == obj) {
-			return true;
-		}
-		if (!super.equals(obj)) {
-			return false;
-		}
-		if (getClass() != obj.getClass()) {
-			return false;
-		}
-		XXEnumDef other = (XXEnumDef) obj;
-		if (defId == null) {
-			if (other.defId != null) {
-				return false;
-			}
-		} else if (!defId.equals(other.defId)) {
-			return false;
-		}
-		if (itemId == null) {
-			if (other.itemId != null) {
-				return false;
-			}
-		} else if (!itemId.equals(other.itemId)) {
-			return false;
-		}
-		if (defaultIndex == null) {
-			if (other.defaultIndex != null) {
-				return false;
-			}
-		} else if (!defaultIndex.equals(other.defaultIndex)) {
-			return false;
-		}
-		if (id == null) {
-			if (other.id != null) {
-				return false;
-			}
-		} else if (!id.equals(other.id)) {
-			return false;
-		}
-		if (name == null) {
-			if (other.name != null) {
-				return false;
-			}
-		} else if (!name.equals(other.name)) {
-			return false;
-		}
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see java.lang.Object#toString()
-	 */
-	@Override
-	public String toString() {
-		return "XXEnumDef [" + super.toString() + " id=" + id + ", defId="
-				+ defId + ", itemId=" + itemId + ", name=" + name + ", defaultIndex=" + defaultIndex
-				+ "]";
-	}
-
+    private static final long serialVersionUID = 1L;
+    /**
+     * id of the XXEnumDef
+     * <ul>
+     * </ul>
+     */
+    @Id
+    @SequenceGenerator(name = "x_enum_def_SEQ", sequenceName = "x_enum_def_SEQ", allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.AUTO, generator = "x_enum_def_SEQ")
+    @Column(name = "id")
+    protected            Long id;
+
+    /**
+     * defId of the XXEnumDef
+     * <ul>
+     * </ul>
+     */
+    @Column(name = "def_id")
+    protected Long defId;
+
+    /**
+     * itemId of the XXEnumDef
+     * <ul>
+     * </ul>
+     */
+    @Column(name = "item_id")
+    protected Long itemId;
+
+    /**
+     * name of the XXEnumDef
+     * <ul>
+     * </ul>
+     */
+    @Column(name = "name")
+    protected String name;
+
+    /**
+     * defaultIndex of the XXEnumDef
+     * <ul>
+     * </ul>
+     */
+    @Column(name = "default_index")
+    protected Integer defaultIndex;
+
+    /**
+     * Returns the value for the member attribute <b>id</b>
+     *
+     * @return Date - value of member attribute <b>id</b> .
+     */
+    public Long getId() {
+        return this.id;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b> id</b> . You
+     * cannot set null to the attribute.
+     *
+     * @param id Value to set member attribute <b> id</b>
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see java.lang.Object#equals(java.lang.Object)
+     */
+    @Override
+    public boolean equals(Object obj) {
+        if (!super.equals(obj)) {
+            return false;
+        }
+        if (this == obj) {
+            return true;
+        }
+        if (!super.equals(obj)) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        XXEnumDef other = (XXEnumDef) obj;
+        if (defId == null) {
+            if (other.defId != null) {
+                return false;
+            }
+        } else if (!defId.equals(other.defId)) {
+            return false;
+        }
+        if (itemId == null) {
+            if (other.itemId != null) {
+                return false;
+            }
+        } else if (!itemId.equals(other.itemId)) {
+            return false;
+        }
+        if (defaultIndex == null) {
+            if (other.defaultIndex != null) {
+                return false;
+            }
+        } else if (!defaultIndex.equals(other.defaultIndex)) {
+            return false;
+        }
+        if (id == null) {
+            if (other.id != null) {
+                return false;
+            }
+        } else if (!id.equals(other.id)) {
+            return false;
+        }
+        if (name == null) {
+            return other.name == null;
+        } else
+            return name.equals(other.name);
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        return "XXEnumDef [" + super.toString() + " id=" + id + ", defId="
+                + defId + ", itemId=" + itemId + ", name=" + name + ", defaultIndex=" + defaultIndex
+                + "]";
+    }
+
+    /**
+     * Returns the value for the member attribute <b>defId</b>
+     *
+     * @return Date - value of member attribute <b>defId</b> .
+     */
+    public Long getDefid() {
+        return this.defId;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b> defId</b> . You
+     * cannot set null to the attribute.
+     *
+     * @param defId Value to set member attribute <b> defId</b>
+     */
+    public void setDefid(Long defId) {
+        this.defId = defId;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>itemId</b>
+     *
+     * @return Long - value of member attribute <b>itemId</b> .
+     */
+    public Long getItemId() {
+        return this.itemId;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b> itemId</b> . You
+     * cannot set null to the attribute.
+     *
+     * @param defId Value to set member attribute <b> itemId</b>
+     */
+    public void setItemId(Long itemId) {
+        this.itemId = itemId;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>name</b>
+     *
+     * @return Date - value of member attribute <b>name</b> .
+     */
+    public String getName() {
+        return this.name;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b> name</b> . You
+     * cannot set null to the attribute.
+     *
+     * @param name Value to set member attribute <b> name</b>
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /**
+     * Returns the value for the member attribute <b>defaultIndex</b>
+     *
+     * @return Date - value of member attribute <b>defaultIndex</b> .
+     */
+    public Integer getDefaultindex() {
+        return this.defaultIndex;
+    }
+
+    /**
+     * This method sets the value to the member attribute <b> defaultIndex</b> .
+     * You cannot set null to the attribute.
+     *
+     * @param defaultIndex Value to set member attribute <b> defaultIndex</b>
+     */
+    public void setDefaultindex(Integer defaultIndex) {
+        this.defaultIndex = defaultIndex;
+    }
 }
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXEnumElementDef.java b/security-admin/src/main/java/org/apache/ranger/entity/XXEnumElementDef.java
index 555984f96..17175e571 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXEnumElementDef.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXEnumElementDef.java
@@ -18,295 +18,283 @@
  */
 package org.apache.ranger.entity;
 
-import javax.persistence.*;
+import javax.persistence.Cacheable;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
 
 @Entity
 @Cacheable
 @Table(name = "x_enum_element_def")
 public class XXEnumElementDef extends XXDBBase implements java.io.Serializable {
-	private static final long serialVersionUID = 1L;
-	/**
-	 * id of the XXEnumDefElement
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Id
-	@SequenceGenerator(name = "x_enum_element_def_SEQ", sequenceName = "x_enum_element_def_SEQ", allocationSize = 1)
-	@GeneratedValue(strategy = GenerationType.AUTO, generator = "x_enum_element_def_SEQ")
-	@Column(name = "id")
-	protected Long id;
+    private static final long serialVersionUID = 1L;
+    /**
+     * id of the XXEnumDefElement
+     * <ul>
+     * </ul>
+     */
+    @Id
+    @SequenceGenerator(name = "x_enum_element_def_SEQ", sequenceName = "x_enum_element_def_SEQ", allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.AUTO, generator = "x_enum_element_def_SEQ")
+    @Column(name = "id")
+    protected            Long id;
 
-	/**
-	 * enumDefId of the XXEnumDefElement
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Column(name = "enum_def_id")
-	protected Long enumDefId;
+    /**
+     * enumDefId of the XXEnumDefElement
+     * <ul>
+     * </ul>
+     */
+    @Column(name = "enum_def_id")
+    protected Long enumDefId;
 
-	/**
-	 * itemId of the XXEnumDefElement
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Column(name = "item_id")
-	protected Long itemId;
+    /**
+     * itemId of the XXEnumDefElement
+     * <ul>
+     * </ul>
+     */
+    @Column(name = "item_id")
+    protected Long itemId;
 
-	/**
-	 * name of the XXEnumDefElement
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Column(name = "name")
-	protected String name;
+    /**
+     * name of the XXEnumDefElement
+     * <ul>
+     * </ul>
+     */
+    @Column(name = "name")
+    protected String name;
 
-	/**
-	 * label of the XXEnumDefElement
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Column(name = "label")
-	protected String label;
+    /**
+     * label of the XXEnumDefElement
+     * <ul>
+     * </ul>
+     */
+    @Column(name = "label")
+    protected String label;
 
-	/**
-	 * rbKeyLabel of the XXEnumDefElement
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Column(name = "rb_key_label")
-	protected String rbKeyLabel;
+    /**
+     * rbKeyLabel of the XXEnumDefElement
+     * <ul>
+     * </ul>
+     */
+    @Column(name = "rb_key_label")
+    protected String rbKeyLabel;
 
-	/**
-	 * order of the XXEnumDefElement
-	 * <ul>
-	 * </ul>
-	 *
-	 */
-	@Column(name = "sort_order")
-	protected Integer order;
+    /**
+     * order of the XXEnumDefElement
+     * <ul>
+     * </ul>
+     */
+    @Column(name = "sort_order")
+    protected Integer order;
 
-	/**
-	 * This method sets the value to the member attribute <b> id</b> . You
-	 * cannot set null to the attribute.
-	 *
-	 * @param id
-	 *            Value to set member attribute <b> id</b>
-	 */
-	public void setId(Long id) {
-		this.id = id;
-	}
+    /**
+     * Returns the value for the member attribute <b>id</b>
+     *
+     * @return Date - value of member attribute <b>id</b> .
+     */
+    public Long getId() {
+        return this.id;
+    }
 
-	/**
-	 * Returns the value for the member attribute <b>id</b>
-	 *
-	 * @return Date - value of member attribute <b>id</b> .
-	 */
-	public Long getId() {
-		return this.id;
-	}
+    /**
+     * This method sets the value to the member attribute <b> id</b> . You
+     * cannot set null to the attribute.
+     *
+     * @param id Value to set member attribute <b> id</b>
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
 
-	/**
-	 * This method sets the value to the member attribute <b> enumDefId</b> .
-	 * You cannot set null to the attribute.
-	 *
-	 * @param enumDefId
-	 *            Value to set member attribute <b> enumDefId</b>
-	 */
-	public void setEnumdefid(Long enumDefId) {
-		this.enumDefId = enumDefId;
-	}
+    /*
+     * (non-Javadoc)
+     *
+     * @see java.lang.Object#equals(java.lang.Object)
+     */
+    @Override
+    public boolean equals(Object obj) {
+        if (!super.equals(obj)) {
+            return false;
+        }
+        if (this == obj) {
+            return true;
+        }
+        if (!super.equals(obj)) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        XXEnumElementDef other = (XXEnumElementDef) obj;
+        if (enumDefId == null) {
+            if (other.enumDefId != null) {
+                return false;
+            }
+        } else if (!enumDefId.equals(other.enumDefId)) {
+            return false;
+        }
+        if (id == null) {
+            if (other.id != null) {
+                return false;
+            }
+        } else if (!id.equals(other.id)) {
+            return false;
+        }
+        if (label == null) {
+            if (other.label != null) {
+                return false;
+            }
+        } else if (!label.equals(other.label)) {
+            return false;
+        }
+        if (name == null) {
+            if (other.name != null) {
+                return false;
+            }
+        } else if (!name.equals(other.name)) {
+            return false;
+        }
+        if (order == null) {
+            if (other.order != null) {
+                return false;
+            }
+        } else if (!order.equals(other.order)) {
+            return false;
+        }
+        if (rbKeyLabel == null) {
+            return other.rbKeyLabel == null;
+        } else
+            return rbKeyLabel.equals(other.rbKeyLabel);
+    }
 
-	/**
-	 * Returns the value for the member attribute <b>enumDefId</b>
-	 *
-	 * @return Date - value of member attribute <b>enumDefId</b> .
-	 */
-	public Long getEnumdefid() {
-		return this.enumDefId;
-	}
+    /*
+     * (non-Javadoc)
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        return "XXEnumElementDef [" + super.toString() + " id=" + id
+                + ", enumDefId=" + enumDefId + "itemId=" + itemId + ", name=" + name + ", label="
+                + label + ", rbKeyLabel=" + rbKeyLabel + ", order=" + order
+                + "]";
+    }
 
-	/**
-	 * This method sets the value to the member attribute <b> itemId</b> .
-	 * You cannot set null to the attribute.
-	 *
-	 * @param itemId
-	 *            Value to set member attribute <b> itemId</b>
-	 */
-	public void setItemId(Long itemId) {
-		this.itemId = itemId;
-	}
+    /**
+     * Returns the value for the member attribute <b>enumDefId</b>
+     *
+     * @return Date - value of member attribute <b>enumDefId</b> .
+     */
+    public Long getEnumdefid() {
+        return this.enumDefId;
+    }
 
-	/**
-	 * Returns the value for the member attribute <b>itemId</b>
-	 *
-	 * @return Long - value of member attribute <b>itemId</b> .
-	 */
-	public Long getItemId() {
-		return this.itemId;
-	}
+    /**
+     * This method sets the value to the member attribute <b> enumDefId</b> .
+     * You cannot set null to the attribute.
+     *
+     * @param enumDefId Value to set member attribute <b> enumDefId</b>
+     */
+    public void setEnumdefid(Long enumDefId) {
+        this.enumDefId = enumDefId;
+    }
 
-	/**
-	 * This method sets the value to the member attribute <b> name</b> . You
-	 * cannot set null to the attribute.
-	 *
-	 * @param name
-	 *            Value to set member attribute <b> name</b>
-	 */
-	public void setName(String name) {
-		this.name = name;
-	}
+    /**
+     * Returns the value for the member attribute <b>itemId</b>
+     *
+     * @return Long - value of member attribute <b>itemId</b> .
+     */
+    public Long getItemId() {
+        return this.itemId;
+    }
 
-	/**
-	 * Returns the value for the member attribute <b>name</b>
-	 *
-	 * @return Date - value of member attribute <b>name</b> .
-	 */
-	public String getName() {
-		return this.name;
-	}
+    /**
+     * This method sets the value to the member attribute <b> itemId</b> .
+     * You cannot set null to the attribute.
+     *
+     * @param itemId Value to set member attribute <b> itemId</b>
+     */
+    public void setItemId(Long itemId) {
+        this.itemId = itemId;
+    }
 
-	/**
-	 * This method sets the value to the member attribute <b> label</b> . You
-	 * cannot set null to the attribute.
-	 *
-	 * @param label
-	 *            Value to set member attribute <b> label</b>
-	 */
-	public void setLabel(String label) {
-		this.label = label;
-	}
+    /**
+     * Returns the value for the member attribute <b>name</b>
+     *
+     * @return Date - value of member attribute <b>name</b> .
+     */
+    public String getName() {
+        return this.name;
+    }
 
-	/**
-	 * Returns the value for the member attribute <b>label</b>
-	 *
-	 * @return Date - value of member attribute <b>label</b> .
-	 */
-	public String getLabel() {
-		return this.label;
-	}
+    /**
+     * This method sets the value to the member attribute <b> name</b> . You
+     * cannot set null to the attribute.
+     *
+     * @param name Value to set member attribute <b> name</b>
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
 
-	/**
-	 * This method sets the value to the member attribute <b> rbKeyLabel</b> .
-	 * You cannot set null to the attribute.
-	 *
-	 * @param rbKeyLabel
-	 *            Value to set member attribute <b> rbKeyLabel</b>
-	 */
-	public void setRbkeylabel(String rbKeyLabel) {
-		this.rbKeyLabel = rbKeyLabel;
-	}
+    /**
+     * Returns the value for the member attribute <b>label</b>
+     *
+     * @return Date - value of member attribute <b>label</b> .
+     */
+    public String getLabel() {
+        return this.label;
+    }
 
-	/**
-	 * Returns the value for the member attribute <b>rbKeyLabel</b>
-	 *
-	 * @return Date - value of member attribute <b>rbKeyLabel</b> .
-	 */
-	public String getRbkeylabel() {
-		return this.rbKeyLabel;
-	}
+    /**
+     * This method sets the value to the member attribute <b> label</b> . You
+     * cannot set null to the attribute.
+     *
+     * @param label Value to set member attribute <b> label</b>
+     */
+    public void setLabel(String label) {
+        this.label = label;
+    }
 
-	/**
-	 * This method sets the value to the member attribute <b> order</b> . You
-	 * cannot set null to the attribute.
-	 *
-	 * @param order
-	 *            Value to set member attribute <b> order</b>
-	 */
-	public void setOrder(Integer order) {
-		this.order = order;
-	}
+    /**
+     * Returns the value for the member attribute <b>rbKeyLabel</b>
+     *
+     * @return Date - value of member attribute <b>rbKeyLabel</b> .
+     */
+    public String getRbkeylabel() {
+        return this.rbKeyLabel;
+    }
 
-	/**
-	 * Returns the value for the member attribute <b>order</b>
-	 *
-	 * @return Date - value of member attribute <b>order</b> .
-	 */
-	public Integer getOrder() {
-		return this.order;
-	}
+    /**
+     * This method sets the value to the member attribute <b> rbKeyLabel</b> .
+     * You cannot set null to the attribute.
+     *
+     * @param rbKeyLabel Value to set member attribute <b> rbKeyLabel</b>
+     */
+    public void setRbkeylabel(String rbKeyLabel) {
+        this.rbKeyLabel = rbKeyLabel;
+    }
 
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	@Override
-	public boolean equals(Object obj) {
-		if (!super.equals(obj)) {
-			return false;
-		}
-		if (this == obj) {
-			return true;
-		}
-		if (!super.equals(obj)) {
-			return false;
-		}
-		if (getClass() != obj.getClass()) {
-			return false;
-		}
-		XXEnumElementDef other = (XXEnumElementDef) obj;
-		if (enumDefId == null) {
-			if (other.enumDefId != null) {
-				return false;
-			}
-		} else if (!enumDefId.equals(other.enumDefId)) {
-			return false;
-		}
-		if (id == null) {
-			if (other.id != null) {
-				return false;
-			}
-		} else if (!id.equals(other.id)) {
-			return false;
-		}
-		if (label == null) {
-			if (other.label != null) {
-				return false;
-			}
-		} else if (!label.equals(other.label)) {
-			return false;
-		}
-		if (name == null) {
-			if (other.name != null) {
-				return false;
-			}
-		} else if (!name.equals(other.name)) {
-			return false;
-		}
-		if (order == null) {
-			if (other.order != null) {
-				return false;
-			}
-		} else if (!order.equals(other.order)) {
-			return false;
-		}
-		if (rbKeyLabel == null) {
-			if (other.rbKeyLabel != null) {
-				return false;
-			}
-		} else if (!rbKeyLabel.equals(other.rbKeyLabel)) {
-			return false;
-		}
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see java.lang.Object#toString()
-	 */
-	@Override
-	public String toString() {
-		return "XXEnumElementDef [" + super.toString() + " id=" + id
-				+ ", enumDefId=" + enumDefId + "itemId=" + itemId + ", name=" + name + ", label="
-				+ label + ", rbKeyLabel=" + rbKeyLabel + ", order=" + order
-				+ "]";
-	}
+    /**
+     * Returns the value for the member attribute <b>order</b>
+     *
+     * @return Date - value of member attribute <b>order</b> .
+     */
+    public Integer getOrder() {
+        return this.order;
+    }
 
+    /**
+     * This method sets the value to the member attribute <b> order</b> . You
+     * cannot set null to the attribute.
+     *
+     * @param order Value to set member attribute <b> order</b>
+     */
+    public void setOrder(Integer order) {
+        this.order = order;
+    }
 }
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXGdsDataShare.java b/security-admin/src/main/java/org/apache/ranger/entity/XXGdsDataShare.java
index 3ab96e29c..a2bcb0af3 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXGdsDataShare.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXGdsDataShare.java
@@ -21,14 +21,23 @@ package org.apache.ranger.entity;
 
 import org.apache.ranger.common.AppConstants;
 
-import javax.persistence.*;
+import javax.persistence.Cacheable;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import javax.persistence.Version;
 import javax.xml.bind.annotation.XmlRootElement;
+
 import java.io.Serializable;
 import java.util.Objects;
 
 @Entity
 @Cacheable
-@Table(name="x_gds_data_share")
+@Table(name = "x_gds_data_share")
 @XmlRootElement
 public class XXGdsDataShare extends XXDBBase implements Serializable {
     private static final long serialVersionUID = 1L;
@@ -82,71 +91,70 @@ public class XXGdsDataShare extends XXDBBase implements Serializable {
     @Column(name = "additional_info")
     protected String additionalInfo;
 
+    public String getGuid()                                      {return guid;}
 
-    @Override
-    public void setId(Long id) { this.id = id; }
-
-    @Override
-    public Long getId() { return id; }
+    public void setGuid(String guid)                             {this.guid = guid;}
 
-    public String getGuid() { return guid; }
+    public Long getVersion()                                     {return version;}
 
-    public void setGuid(String guid) { this.guid = guid; }
+    public void setVersion(Long version)                         {this.version = version;}
 
-    public Long getVersion() { return version; }
+    public Boolean getIsEnabled()                                {return isEnabled;}
 
-    public void setVersion(Long version) { this.version = version; }
+    public void setIsEnabled(Boolean isEnabled)                  {this.isEnabled = isEnabled;}
 
-    public Boolean getIsEnabled() { return isEnabled; }
+    public Long getServiceId()                                   {return serviceId;}
 
-    public void setIsEnabled(Boolean isEnabled) { this.isEnabled = isEnabled; }
+    public void setServiceId(Long serviceId)                     {this.serviceId = serviceId;}
 
-    public Long getServiceId() { return serviceId; }
+    public Long getZoneId()                                      {return zoneId;}
 
-    public void setServiceId(Long serviceId) { this.serviceId = serviceId; }
+    public void setZoneId(Long zoneId)                           {this.zoneId = zoneId;}
 
-    public Long getZoneId() { return zoneId; }
+    public String getName()                                      {return name;}
 
-    public void setZoneId(Long zoneId) { this.zoneId = zoneId; }
+    public void setName(String name)                             {this.name = name;}
 
-    public String getName() { return name; }
+    public String getDescription()                               {return description;}
 
-    public void setName(String name) { this.name = name; }
+    public void setDescription(String description)               {this.description = description;}
 
-    public String getDescription() { return description; }
+    public String getAcl()                                       {return acl;}
 
-    public void setDescription(String description) { this.description = description; }
+    public void setAcl(String acl)                               {this.acl = acl;}
 
-    public String getAcl() { return acl; }
+    public String getConditionExpr()                             {return conditionExpr;}
 
-    public void setAcl(String acl) { this.acl = acl; }
+    public void setConditionExpr(String conditionExpr)           {this.conditionExpr = conditionExpr;}
 
-    public String getConditionExpr() { return conditionExpr; }
+    public String getDefaultAccessTypes()                        {return defaultAccessTypes;}
 
-    public void setConditionExpr(String conditionExpr) { this.conditionExpr = conditionExpr; }
+    public void setDefaultAccessTypes(String defaultAccessTypes) {this.defaultAccessTypes = defaultAccessTypes;}
 
-    public String getDefaultAccessTypes() { return defaultAccessTypes; }
+    public String getDefaultTagMasks()                           {return defaultTagMasks;}
 
-    public void setDefaultAccessTypes(String defaultAccessTypes) { this.defaultAccessTypes = defaultAccessTypes; }
+    public void setDefaultTagMasks(String defaultMasks)          {this.defaultTagMasks = defaultMasks;}
 
-    public String getDefaultTagMasks() { return defaultTagMasks; }
+    public String getTermsOfUse()                                {return termsOfUse;}
 
-    public void setDefaultTagMasks(String defaultMasks) {this.defaultTagMasks = defaultMasks; }
+    public void setTermsOfUse(String termsOfUse)                 {this.termsOfUse = termsOfUse;}
 
-    public String getTermsOfUse() { return termsOfUse; }
+    public String getOptions()                                   {return options;}
 
-    public void setTermsOfUse(String termsOfUse) { this.termsOfUse = termsOfUse; }
+    public void setOptions(String options)                       {this.options = options;}
 
-    public String getOptions() { return options; }
+    public String getAdditionalInfo()                            {return additionalInfo;}
 
-    public void setOptions(String options) { this.options = options; }
+    public void setAdditionalInfo(String additionalInfo)         {this.additionalInfo = additionalInfo;}
 
-    public String getAdditionalInfo() { return additionalInfo; }
+    @Override
+    public int getMyClassType() {return AppConstants.CLASS_TYPE_GDS_DATA_SHARE;}
 
-    public void setAdditionalInfo(String additionalInfo) { this.additionalInfo = additionalInfo; }
+    @Override
+    public Long getId() {return id;}
 
     @Override
-    public int getMyClassType() { return AppConstants.CLASS_TYPE_GDS_DATA_SHARE; }
+    public void setId(Long id) {this.id = id;}
 
     @Override
     public int hashCode() {
@@ -166,20 +174,20 @@ public class XXGdsDataShare extends XXDBBase implements Serializable {
         XXGdsDataShare other = (XXGdsDataShare) obj;
 
         return Objects.equals(id, other.id) &&
-               Objects.equals(guid, other.guid) &&
-               Objects.equals(version, other.version) &&
-               Objects.equals(isEnabled, other.isEnabled) &&
-               Objects.equals(serviceId, other.serviceId) &&
-               Objects.equals(zoneId, other.zoneId) &&
-               Objects.equals(name, other.name) &&
-               Objects.equals(description, other.description) &&
-               Objects.equals(acl, other.acl) &&
-               Objects.equals(conditionExpr, other.conditionExpr) &&
-               Objects.equals(defaultAccessTypes, other.defaultAccessTypes) &&
-               Objects.equals(defaultTagMasks, other.defaultTagMasks) &&
-               Objects.equals(termsOfUse, other.termsOfUse) &&
-               Objects.equals(options, other.options) &&
-               Objects.equals(additionalInfo, other.additionalInfo);
+                Objects.equals(guid, other.guid) &&
+                Objects.equals(version, other.version) &&
+                Objects.equals(isEnabled, other.isEnabled) &&
+                Objects.equals(serviceId, other.serviceId) &&
+                Objects.equals(zoneId, other.zoneId) &&
+                Objects.equals(name, other.name) &&
+                Objects.equals(description, other.description) &&
+                Objects.equals(acl, other.acl) &&
+                Objects.equals(conditionExpr, other.conditionExpr) &&
+                Objects.equals(defaultAccessTypes, other.defaultAccessTypes) &&
+                Objects.equals(defaultTagMasks, other.defaultTagMasks) &&
+                Objects.equals(termsOfUse, other.termsOfUse) &&
+                Objects.equals(options, other.options) &&
+                Objects.equals(additionalInfo, other.additionalInfo);
     }
 
     @Override
@@ -189,23 +197,23 @@ public class XXGdsDataShare extends XXDBBase implements Serializable {
 
     public StringBuilder toString(StringBuilder sb) {
         sb.append("XXGdsDataShare={ ")
-          .append(super.toString()).append(" ")
-          .append("id={").append(id).append("} ")
-          .append("guid={").append(guid).append("} ")
-          .append("version={").append(version).append("} ")
-          .append("isEnabled={").append(isEnabled).append("} ")
-          .append("serviceId={").append(serviceId).append("} ")
-          .append("zoneId={").append(zoneId).append("} ")
-          .append("name={").append(name).append("} ")
-          .append("description={").append(description).append("} ")
-          .append("acl={").append(acl).append("} ")
-          .append("conditionExpr={").append(conditionExpr).append("} ")
-          .append("defaultAccessTypes={").append(defaultAccessTypes).append("} ")
-          .append("defaultMasks={").append(defaultTagMasks).append("} ")
-          .append("termsOfUse={").append(termsOfUse).append("} ")
-          .append("options={").append(options).append("} ")
-          .append("additionalInfo={").append(additionalInfo).append("} ")
-          .append(" }");
+                .append(super.toString()).append(" ")
+                .append("id={").append(id).append("} ")
+                .append("guid={").append(guid).append("} ")
+                .append("version={").append(version).append("} ")
+                .append("isEnabled={").append(isEnabled).append("} ")
+                .append("serviceId={").append(serviceId).append("} ")
+                .append("zoneId={").append(zoneId).append("} ")
+                .append("name={").append(name).append("} ")
+                .append("description={").append(description).append("} ")
+                .append("acl={").append(acl).append("} ")
+                .append("conditionExpr={").append(conditionExpr).append("} ")
+                .append("defaultAccessTypes={").append(defaultAccessTypes).append("} ")
+                .append("defaultMasks={").append(defaultTagMasks).append("} ")
+                .append("termsOfUse={").append(termsOfUse).append("} ")
+                .append("options={").append(options).append("} ")
+                .append("additionalInfo={").append(additionalInfo).append("} ")
+                .append(" }");
 
         return sb;
     }
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXGdsDataShareInDataset.java b/security-admin/src/main/java/org/apache/ranger/entity/XXGdsDataShareInDataset.java
index 5c06e152c..014cf9389 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXGdsDataShareInDataset.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXGdsDataShareInDataset.java
@@ -21,14 +21,23 @@ package org.apache.ranger.entity;
 
 import org.apache.ranger.common.AppConstants;
 
-import javax.persistence.*;
+import javax.persistence.Cacheable;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import javax.persistence.Version;
 import javax.xml.bind.annotation.XmlRootElement;
+
 import java.io.Serializable;
 import java.util.Objects;
 
 @Entity
 @Cacheable
-@Table(name="x_gds_data_share_in_dataset")
+@Table(name = "x_gds_data_share_in_dataset")
 @XmlRootElement
 public class XXGdsDataShareInDataset extends XXDBBase implements Serializable {
     private static final long serialVersionUID = 1L;
@@ -76,62 +85,62 @@ public class XXGdsDataShareInDataset extends XXDBBase implements Serializable {
     @Column(name = "approver_id")
     protected Long approverId;
 
-    @Override
-    public void setId(Long id) { this.id = id; }
+    public String getGuid()                              {return guid;}
 
-    @Override
-    public Long getId() { return id; }
+    public void setGuid(String guid)                     {this.guid = guid;}
 
-    public String getGuid() { return guid; }
+    public Long getVersion()                             {return version;}
 
-    public void setGuid(String guid) { this.guid = guid; }
+    public void setVersion(Long version)                 {this.version = version;}
 
-    public Long getVersion() { return version; }
+    public Boolean getIsEnabled()                        {return isEnabled;}
 
-    public void setVersion(Long version) { this.version = version; }
+    public void setIsEnabled(Boolean isEnabled)          {this.isEnabled = isEnabled;}
 
-    public Boolean getIsEnabled() { return isEnabled; }
+    public String getDescription()                       {return description;}
 
-    public void setIsEnabled(Boolean isEnabled) { this.isEnabled = isEnabled; }
+    public void setDescription(String description)       {this.description = description;}
 
-    public String getDescription() { return description; }
+    public Long getDataShareId()                         {return dataShareId;}
 
-    public void setDescription(String description) { this.description = description; }
+    public void setDataShareId(Long dataShareId)         {this.dataShareId = dataShareId;}
 
-    public Long getDataShareId() { return dataShareId; }
+    public Long getDatasetId()                           {return datasetId;}
 
-    public void setDataShareId(Long dataShareId) { this.dataShareId = dataShareId; }
+    public void setDatasetId(Long datasetId)             {this.datasetId = datasetId;}
 
-    public Long getDatasetId() { return datasetId; }
+    public Short getStatus()                             {return status;}
 
-    public void setDatasetId(Long datasetId) { this.datasetId = datasetId; }
+    public void setStatus(Short status)                  {this.status = status;}
 
-    public Short getStatus() { return status; }
+    public String getValidityPeriod()                    {return validityPeriod;}
 
-    public void setStatus(Short status) { this.status = status; }
+    public void setValidityPeriod(String validityPeriod) {this.validityPeriod = validityPeriod;}
 
-    public String getValidityPeriod() { return validityPeriod; }
+    public String getProfiles()                          {return profiles;}
 
-    public void setValidityPeriod(String validityPeriod) { this.validityPeriod = validityPeriod; }
+    public void setProfiles(String profiles)             {this.profiles = profiles;}
 
-    public String getProfiles() { return profiles; }
+    public String getOptions()                           {return options;}
 
-    public void setProfiles(String profiles) { this.profiles = profiles; }
+    public void setOptions(String options)               {this.options = options;}
 
-    public String getOptions() { return options; }
+    public String getAdditionalInfo()                    {return additionalInfo;}
 
-    public void setOptions(String options) { this.options = options; }
+    public void setAdditionalInfo(String additionalInfo) {this.additionalInfo = additionalInfo;}
 
-    public String getAdditionalInfo() { return additionalInfo; }
+    public Long getApproverId()                          {return approverId;}
 
-    public void setAdditionalInfo(String additionalInfo) { this.additionalInfo = additionalInfo; }
+    public void setApproverId(Long approverId)           {this.approverId = approverId;}
 
-    public Long getApproverId() { return approverId; }
+    @Override
+    public int getMyClassType() {return AppConstants.CLASS_TYPE_GDS_DATA_SHARE_IN_DATASET;}
 
-    public void setApproverId(Long approverId) { this.approverId = approverId; }
+    @Override
+    public Long getId() {return id;}
 
     @Override
-    public int getMyClassType() { return AppConstants.CLASS_TYPE_GDS_DATA_SHARE_IN_DATASET; }
+    public void setId(Long id) {this.id = id;}
 
     @Override
     public int hashCode() {
@@ -151,17 +160,17 @@ public class XXGdsDataShareInDataset extends XXDBBase implements Serializable {
         XXGdsDataShareInDataset other = (XXGdsDataShareInDataset) obj;
 
         return Objects.equals(id, other.id) &&
-               Objects.equals(guid, other.guid) &&
-               Objects.equals(version, other.version) &&
-               Objects.equals(isEnabled, other.isEnabled) &&
-               Objects.equals(dataShareId, other.dataShareId) &&
-               Objects.equals(datasetId, other.datasetId) &&
-               Objects.equals(status, other.status) &&
-               Objects.equals(validityPeriod, other.validityPeriod) &&
-               Objects.equals(profiles, other.profiles) &&
-               Objects.equals(options, other.options) &&
-               Objects.equals(additionalInfo, other.additionalInfo) &&
-               Objects.equals(approverId, other.approverId);
+                Objects.equals(guid, other.guid) &&
+                Objects.equals(version, other.version) &&
+                Objects.equals(isEnabled, other.isEnabled) &&
+                Objects.equals(dataShareId, other.dataShareId) &&
+                Objects.equals(datasetId, other.datasetId) &&
+                Objects.equals(status, other.status) &&
+                Objects.equals(validityPeriod, other.validityPeriod) &&
+                Objects.equals(profiles, other.profiles) &&
+                Objects.equals(options, other.options) &&
+                Objects.equals(additionalInfo, other.additionalInfo) &&
+                Objects.equals(approverId, other.approverId);
     }
 
     @Override
@@ -171,22 +180,21 @@ public class XXGdsDataShareInDataset extends XXDBBase implements Serializable {
 
     public StringBuilder toString(StringBuilder sb) {
         sb.append("XXDataShareInDataset={ ")
-          .append(super.toString() + "} ")
-          .append("id={").append(id).append("} ")
-          .append("guid={").append(guid).append("} ")
-          .append("version={").append(version).append("} ")
-          .append("isEnabled={").append(isEnabled).append("} ")
-          .append("dataShareId={").append(dataShareId).append("} ")
-          .append("datasetId={").append(datasetId).append("} ")
-          .append("status={").append(status).append("} ")
-          .append("validityPeriod={").append(validityPeriod).append("} ")
-          .append("profiles={").append(profiles).append("} ")
-          .append("options={").append(options).append("} ")
-          .append("additionalInfo={").append(additionalInfo).append("} ")
-          .append("approverId={").append(approverId).append("} ")
-          .append(" }");
+                .append(super.toString() + "} ")
+                .append("id={").append(id).append("} ")
+                .append("guid={").append(guid).append("} ")
+                .append("version={").append(version).append("} ")
+                .append("isEnabled={").append(isEnabled).append("} ")
+                .append("dataShareId={").append(dataShareId).append("} ")
+                .append("datasetId={").append(datasetId).append("} ")
+                .append("status={").append(status).append("} ")
+                .append("validityPeriod={").append(validityPeriod).append("} ")
+                .append("profiles={").append(profiles).append("} ")
+                .append("options={").append(options).append("} ")
+                .append("additionalInfo={").append(additionalInfo).append("} ")
+                .append("approverId={").append(approverId).append("} ")
+                .append(" }");
 
         return sb;
     }
-
 }
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXGdsDataset.java b/security-admin/src/main/java/org/apache/ranger/entity/XXGdsDataset.java
index 7a1404d22..3052be4c3 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXGdsDataset.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXGdsDataset.java
@@ -21,14 +21,23 @@ package org.apache.ranger.entity;
 
 import org.apache.ranger.common.AppConstants;
 
-import javax.persistence.*;
+import javax.persistence.Cacheable;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import javax.persistence.Version;
 import javax.xml.bind.annotation.XmlRootElement;
+
 import java.io.Serializable;
 import java.util.Objects;
 
 @Entity
 @Cacheable
-@Table(name="x_gds_dataset")
+@Table(name = "x_gds_dataset")
 @XmlRootElement
 public class XXGdsDataset extends XXDBBase implements Serializable {
     private static final long serialVersionUID = 1L;
@@ -76,48 +85,41 @@ public class XXGdsDataset extends XXDBBase implements Serializable {
     @Column(name = "keywords")
     protected String keywords;
 
+    public String getGuid()                              {return guid;}
 
-    @Override
-    public void setId(Long id) { this.id = id; }
-
-    @Override
-    public Long getId() { return id; }
-
-    public String getGuid() { return guid; }
-
-    public void setGuid(String guid) { this.guid = guid; }
+    public void setGuid(String guid)                     {this.guid = guid;}
 
-    public Long getVersion() { return version; }
+    public Long getVersion()                             {return version;}
 
-    public void setVersion(Long version) { this.version = version; }
+    public void setVersion(Long version)                 {this.version = version;}
 
-    public Boolean getIsEnabled() { return isEnabled; }
+    public Boolean getIsEnabled()                        {return isEnabled;}
 
-    public void setIsEnabled(Boolean isEnabled) { this.isEnabled = isEnabled; }
+    public void setIsEnabled(Boolean isEnabled)          {this.isEnabled = isEnabled;}
 
-    public String getName() { return name; }
+    public String getName()                              {return name;}
 
-    public void setName(String name) { this.name = name; }
+    public void setName(String name)                     {this.name = name;}
 
-    public String getDescription() { return description; }
+    public String getDescription()                       {return description;}
 
-    public void setDescription(String description) { this.description = description; }
+    public void setDescription(String description)       {this.description = description;}
 
-    public String getAcl() { return acl; }
+    public String getAcl()                               {return acl;}
 
-    public void setAcl(String acl) { this.acl = acl; }
+    public void setAcl(String acl)                       {this.acl = acl;}
 
-    public String getTermsOfUse() { return termsOfUse; }
+    public String getTermsOfUse()                        {return termsOfUse;}
 
-    public void setTermsOfUse(String termsOfUse) { this.termsOfUse = termsOfUse; }
+    public void setTermsOfUse(String termsOfUse)         {this.termsOfUse = termsOfUse;}
 
-    public String getOptions() { return options; }
+    public String getOptions()                           {return options;}
 
-    public void setOptions(String options) { this.options = options; }
+    public void setOptions(String options)               {this.options = options;}
 
-    public String getAdditionalInfo() { return additionalInfo; }
+    public String getAdditionalInfo()                    {return additionalInfo;}
 
-    public void setAdditionalInfo(String additionalInfo) { this.additionalInfo = additionalInfo; }
+    public void setAdditionalInfo(String additionalInfo) {this.additionalInfo = additionalInfo;}
 
     public String getValiditySchedule() {
         return validitySchedule;
@@ -144,7 +146,13 @@ public class XXGdsDataset extends XXDBBase implements Serializable {
     }
 
     @Override
-    public int getMyClassType() { return AppConstants.CLASS_TYPE_GDS_DATASET; }
+    public int getMyClassType() {return AppConstants.CLASS_TYPE_GDS_DATASET;}
+
+    @Override
+    public Long getId() {return id;}
+
+    @Override
+    public void setId(Long id) {this.id = id;}
 
     @Override
     public int hashCode() {
@@ -165,18 +173,18 @@ public class XXGdsDataset extends XXDBBase implements Serializable {
         XXGdsDataset other = (XXGdsDataset) obj;
 
         return Objects.equals(id, other.id) &&
-               Objects.equals(guid, other.guid) &&
-               Objects.equals(version, other.version) &&
-               Objects.equals(isEnabled, other.isEnabled) &&
-               Objects.equals(name, other.name) &&
-               Objects.equals(description, other.description) &&
-               Objects.equals(acl, other.acl) &&
-               Objects.equals(termsOfUse, other.termsOfUse) &&
-               Objects.equals(options, other.options) &&
-               Objects.equals(additionalInfo, other.additionalInfo) &&
-               Objects.equals(validitySchedule, other.validitySchedule) &&
-               Objects.equals(labels, other.labels) &&
-               Objects.equals(keywords, other.keywords);
+                Objects.equals(guid, other.guid) &&
+                Objects.equals(version, other.version) &&
+                Objects.equals(isEnabled, other.isEnabled) &&
+                Objects.equals(name, other.name) &&
+                Objects.equals(description, other.description) &&
+                Objects.equals(acl, other.acl) &&
+                Objects.equals(termsOfUse, other.termsOfUse) &&
+                Objects.equals(options, other.options) &&
+                Objects.equals(additionalInfo, other.additionalInfo) &&
+                Objects.equals(validitySchedule, other.validitySchedule) &&
+                Objects.equals(labels, other.labels) &&
+                Objects.equals(keywords, other.keywords);
     }
 
     @Override
@@ -186,22 +194,22 @@ public class XXGdsDataset extends XXDBBase implements Serializable {
 
     public StringBuilder toString(StringBuilder sb) {
         sb.append("XXGdsDataset={ ")
-          .append(super.toString()).append(" ")
-          .append("id={").append(id).append("} ")
-          .append("guid={").append(guid).append("} ")
-          .append("version={").append(version).append("} ")
-          .append("isEnabled={").append(isEnabled).append("} ")
-          .append("name={").append(name).append("} ")
-          .append("description={").append(description).append("} ")
-          .append("condition={").append(acl).append("} ")
-          .append("acl={").append(acl).append("} ")
-          .append("termsOfUse={").append(termsOfUse).append("} ")
-          .append("options={").append(options).append("} ")
-          .append("additionalInfo={").append(additionalInfo).append("} ")
-          .append("validitySchedule={").append(validitySchedule).append("} ")
-          .append("labels={").append(labels).append("} ")
-          .append("keywords={").append(keywords).append("} ")
-          .append(" }");
+                .append(super.toString()).append(" ")
+                .append("id={").append(id).append("} ")
+                .append("guid={").append(guid).append("} ")
+                .append("version={").append(version).append("} ")
+                .append("isEnabled={").append(isEnabled).append("} ")
+                .append("name={").append(name).append("} ")
+                .append("description={").append(description).append("} ")
+                .append("condition={").append(acl).append("} ")
+                .append("acl={").append(acl).append("} ")
+                .append("termsOfUse={").append(termsOfUse).append("} ")
+                .append("options={").append(options).append("} ")
+                .append("additionalInfo={").append(additionalInfo).append("} ")
+                .append("validitySchedule={").append(validitySchedule).append("} ")
+                .append("labels={").append(labels).append("} ")
+                .append("keywords={").append(keywords).append("} ")
+                .append(" }");
 
         return sb;
     }
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXGdsDatasetInProject.java b/security-admin/src/main/java/org/apache/ranger/entity/XXGdsDatasetInProject.java
index 49bb4ab6b..f27552d86 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXGdsDatasetInProject.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXGdsDatasetInProject.java
@@ -21,14 +21,23 @@ package org.apache.ranger.entity;
 
 import org.apache.ranger.common.AppConstants;
 
-import javax.persistence.*;
+import javax.persistence.Cacheable;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import javax.persistence.Version;
 import javax.xml.bind.annotation.XmlRootElement;
+
 import java.io.Serializable;
 import java.util.Objects;
 
 @Entity
 @Cacheable
-@Table(name="x_gds_dataset_in_project")
+@Table(name = "x_gds_dataset_in_project")
 @XmlRootElement
 public class XXGdsDatasetInProject extends XXDBBase implements Serializable {
     private static final long serialVersionUID = 1L;
@@ -76,62 +85,62 @@ public class XXGdsDatasetInProject extends XXDBBase implements Serializable {
     @Column(name = "approver_id")
     protected Long approverId;
 
-    @Override
-    public void setId(Long id) { this.id = id; }
+    public String getGuid()                              {return guid;}
 
-    @Override
-    public Long getId() { return id; }
+    public void setGuid(String guid)                     {this.guid = guid;}
 
-    public String getGuid() { return guid; }
+    public Long getVersion()                             {return version;}
 
-    public void setGuid(String guid) { this.guid = guid; }
+    public void setVersion(Long version)                 {this.version = version;}
 
-    public Long getVersion() { return version; }
+    public Boolean getIsEnabled()                        {return isEnabled;}
 
-    public void setVersion(Long version) { this.version = version; }
+    public void setIsEnabled(Boolean isEnabled)          {this.isEnabled = isEnabled;}
 
-    public Boolean getIsEnabled() { return isEnabled; }
+    public String getDescription()                       {return description;}
 
-    public void setIsEnabled(Boolean isEnabled) { this.isEnabled = isEnabled; }
+    public void setDescription(String description)       {this.description = description;}
 
-    public String getDescription() { return description; }
+    public Long getDatasetId()                           {return datasetId;}
 
-    public void setDescription(String description) { this.description = description; }
+    public void setDatasetId(Long datasetId)             {this.datasetId = datasetId;}
 
-    public Long getDatasetId() { return datasetId; }
+    public Long getProjectId()                           {return projectId;}
 
-    public void setDatasetId(Long datasetId) { this.datasetId = datasetId; }
+    public void setProjectId(Long projectId)             {this.projectId = projectId;}
 
-    public Long getProjectId() { return projectId; }
+    public Short getStatus()                             {return status;}
 
-    public void setProjectId(Long projectId) { this.projectId = projectId; }
+    public void setStatus(Short status)                  {this.status = status;}
 
-    public Short getStatus() { return status; }
+    public String getValidityPeriod()                    {return validityPeriod;}
 
-    public void setStatus(Short status) { this.status = status; }
+    public void setValidityPeriod(String validityPeriod) {this.validityPeriod = validityPeriod;}
 
-    public String getValidityPeriod() { return validityPeriod; }
+    public String getProfiles()                          {return profiles;}
 
-    public void setValidityPeriod(String validityPeriod) { this.validityPeriod = validityPeriod; }
+    public void setProfiles(String profiles)             {this.profiles = profiles;}
 
-    public String getProfiles() { return profiles; }
+    public String getOptions()                           {return options;}
 
-    public void setProfiles(String profiles) { this.profiles = profiles; }
+    public void setOptions(String options)               {this.options = options;}
 
-    public String getOptions() { return options; }
+    public String getAdditionalInfo()                    {return additionalInfo;}
 
-    public void setOptions(String options) { this.options = options; }
+    public void setAdditionalInfo(String additionalInfo) {this.additionalInfo = additionalInfo;}
 
-    public String getAdditionalInfo() { return additionalInfo; }
+    public Long getApproverId()                          {return approverId;}
 
-    public void setAdditionalInfo(String additionalInfo) { this.additionalInfo = additionalInfo; }
+    public void setApproverId(Long approverId)           {this.approverId = approverId;}
 
-    public Long getApproverId() { return approverId; }
+    @Override
+    public int getMyClassType() {return AppConstants.CLASS_TYPE_GDS_DATASET_IN_PROJECT;}
 
-    public void setApproverId(Long approverId) { this.approverId = approverId; }
+    @Override
+    public Long getId() {return id;}
 
     @Override
-    public int getMyClassType() { return AppConstants.CLASS_TYPE_GDS_DATASET_IN_PROJECT; }
+    public void setId(Long id) {this.id = id;}
 
     @Override
     public int hashCode() {
@@ -151,18 +160,18 @@ public class XXGdsDatasetInProject extends XXDBBase implements Serializable {
         XXGdsDatasetInProject other = (XXGdsDatasetInProject) obj;
 
         return Objects.equals(id, other.id) &&
-               Objects.equals(guid, other.guid) &&
-               Objects.equals(version, other.version) &&
-               Objects.equals(isEnabled, other.isEnabled) &&
-               Objects.equals(description, other.description) &&
-               Objects.equals(datasetId, other.datasetId) &&
-               Objects.equals(projectId, other.projectId) &&
-               Objects.equals(status, other.status) &&
-               Objects.equals(validityPeriod, other.validityPeriod) &&
-               Objects.equals(profiles, other.profiles) &&
-               Objects.equals(options, other.options) &&
-               Objects.equals(additionalInfo, other.additionalInfo) &&
-               Objects.equals(approverId, other.approverId);
+                Objects.equals(guid, other.guid) &&
+                Objects.equals(version, other.version) &&
+                Objects.equals(isEnabled, other.isEnabled) &&
+                Objects.equals(description, other.description) &&
+                Objects.equals(datasetId, other.datasetId) &&
+                Objects.equals(projectId, other.projectId) &&
+                Objects.equals(status, other.status) &&
+                Objects.equals(validityPeriod, other.validityPeriod) &&
+                Objects.equals(profiles, other.profiles) &&
+                Objects.equals(options, other.options) &&
+                Objects.equals(additionalInfo, other.additionalInfo) &&
+                Objects.equals(approverId, other.approverId);
     }
 
     @Override
@@ -172,21 +181,21 @@ public class XXGdsDatasetInProject extends XXDBBase implements Serializable {
 
     public StringBuilder toString(StringBuilder sb) {
         sb.append("XXDataShareInDataset={ ")
-          .append(super.toString() + "} ")
-          .append("id={").append(id).append("} ")
-          .append("guid={").append(guid).append("} ")
-          .append("version={").append(version).append("} ")
-          .append("isEnabled={").append(isEnabled).append("} ")
-          .append("description={").append(description).append("} ")
-          .append("datasetId={").append(datasetId).append("} ")
-          .append("dataShareId={").append(projectId).append("} ")
-          .append("status={").append(status).append("} ")
-          .append("validityPeriod={").append(validityPeriod).append("} ")
-          .append("profiles={").append(profiles).append("} ")
-          .append("options={").append(options).append("} ")
-          .append("additionalInfo={").append(additionalInfo).append("} ")
-          .append("approverId={").append(approverId).append("} ")
-          .append(" }");
+                .append(super.toString() + "} ")
+                .append("id={").append(id).append("} ")
+                .append("guid={").append(guid).append("} ")
+                .append("version={").append(version).append("} ")
+                .append("isEnabled={").append(isEnabled).append("} ")
+                .append("description={").append(description).append("} ")
+                .append("datasetId={").append(datasetId).append("} ")
+                .append("dataShareId={").append(projectId).append("} ")
+                .append("status={").append(status).append("} ")
+                .append("validityPeriod={").append(validityPeriod).append("} ")
+                .append("profiles={").append(profiles).append("} ")
+                .append("options={").append(options).append("} ")
+                .append("additionalInfo={").append(additionalInfo).append("} ")
+                .append("approverId={").append(approverId).append("} ")
+                .append(" }");
 
         return sb;
     }
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXGdsDatasetPolicyMap.java b/security-admin/src/main/java/org/apache/ranger/entity/XXGdsDatasetPolicyMap.java
index 2d79c94c3..3f638cc0c 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXGdsDatasetPolicyMap.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXGdsDatasetPolicyMap.java
@@ -21,14 +21,22 @@ package org.apache.ranger.entity;
 
 import org.apache.ranger.common.AppConstants;
 
-import javax.persistence.*;
+import javax.persistence.Cacheable;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
 import javax.xml.bind.annotation.XmlRootElement;
+
 import java.io.Serializable;
 import java.util.Objects;
 
 @Entity
 @Cacheable
-@Table(name="x_gds_dataset_policy_map")
+@Table(name = "x_gds_dataset_policy_map")
 @XmlRootElement
 public class XXGdsDatasetPolicyMap implements Serializable {
     private static final long serialVersionUID = 1L;
@@ -45,26 +53,26 @@ public class XXGdsDatasetPolicyMap implements Serializable {
     @Column(name = "policy_id")
     protected Long policyId;
 
-    public XXGdsDatasetPolicyMap() { }
+    public XXGdsDatasetPolicyMap() {}
 
     public XXGdsDatasetPolicyMap(Long datasetId, Long policyId) {
         setDatasetId(datasetId);
         setPolicyId(policyId);
     }
 
-    public void setId(Long id) { this.id = id; }
+    public Long getId()                      {return id;}
 
-    public Long getId() { return id; }
+    public void setId(Long id)               {this.id = id;}
 
-    public Long getDatasetId() { return datasetId; }
+    public Long getDatasetId()               {return datasetId;}
 
-    public void setDatasetId(Long datasetId) { this.datasetId = datasetId; }
+    public void setDatasetId(Long datasetId) {this.datasetId = datasetId;}
 
-    public Long getPolicyId() { return policyId; }
+    public Long getPolicyId()                {return policyId;}
 
-    public void setPolicyId(Long policyId) { this.policyId = policyId; }
+    public void setPolicyId(Long policyId)   {this.policyId = policyId;}
 
-    public int getMyClassType() { return AppConstants.CLASS_TYPE_GDS_DATASET_POLICY_MAP; }
+    public int getMyClassType()              {return AppConstants.CLASS_TYPE_GDS_DATASET_POLICY_MAP;}
 
     @Override
     public int hashCode() {
@@ -84,8 +92,8 @@ public class XXGdsDatasetPolicyMap implements Serializable {
         XXGdsDatasetPolicyMap other = (XXGdsDatasetPolicyMap) obj;
 
         return Objects.equals(id, other.id) &&
-               Objects.equals(datasetId, other.datasetId) &&
-               Objects.equals(policyId, other.policyId);
+                Objects.equals(datasetId, other.datasetId) &&
+                Objects.equals(policyId, other.policyId);
     }
 
     @Override
@@ -95,11 +103,11 @@ public class XXGdsDatasetPolicyMap implements Serializable {
 
     public StringBuilder toString(StringBuilder sb) {
         sb.append("XXGdsDatasetPolicyMap={ ")
-          .append(super.toString() + "} ")
-          .append("id={").append(id).append("} ")
-          .append("datasetId={").append(datasetId).append("} ")
-          .append("policyId={").append(policyId).append("} ")
-          .append(" }");
+                .append(super.toString() + "} ")
+                .append("id={").append(id).append("} ")
+                .append("datasetId={").append(datasetId).append("} ")
+                .append("policyId={").append(policyId).append("} ")
+                .append(" }");
 
         return sb;
     }
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXGdsProject.java b/security-admin/src/main/java/org/apache/ranger/entity/XXGdsProject.java
index 566fdac96..ea3b83a07 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXGdsProject.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXGdsProject.java
@@ -21,14 +21,23 @@ package org.apache.ranger.entity;
 
 import org.apache.ranger.common.AppConstants;
 
-import javax.persistence.*;
+import javax.persistence.Cacheable;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import javax.persistence.Version;
 import javax.xml.bind.annotation.XmlRootElement;
+
 import java.io.Serializable;
 import java.util.Objects;
 
 @Entity
 @Cacheable
-@Table(name="x_gds_project")
+@Table(name = "x_gds_project")
 @XmlRootElement
 public class XXGdsProject extends XXDBBase implements Serializable {
     private static final long serialVersionUID = 1L;
@@ -67,50 +76,50 @@ public class XXGdsProject extends XXDBBase implements Serializable {
     @Column(name = "additional_info")
     protected String additionalInfo;
 
-    @Override
-    public void setId(Long id) { this.id = id; }
+    public String getGuid()                              {return guid;}
 
-    @Override
-    public Long getId() { return id; }
+    public void setGuid(String guid)                     {this.guid = guid;}
 
-    public String getGuid() { return guid; }
+    public Long getVersion()                             {return version;}
 
-    public void setGuid(String guid) { this.guid = guid; }
+    public void setVersion(Long version)                 {this.version = version;}
 
-    public Long getVersion() { return version; }
+    public Boolean getIsEnabled()                        {return isEnabled;}
 
-    public void setVersion(Long version) { this.version = version; }
+    public void setIsEnabled(Boolean isEnabled)          {this.isEnabled = isEnabled;}
 
-    public Boolean getIsEnabled() { return isEnabled; }
+    public String getName()                              {return name;}
 
-    public void setIsEnabled(Boolean isEnabled) { this.isEnabled = isEnabled; }
+    public void setName(String name)                     {this.name = name;}
 
-    public String getName() { return name; }
+    public String getDescription()                       {return description;}
 
-    public void setName(String name) { this.name = name; }
+    public void setDescription(String description)       {this.description = description;}
 
-    public String getDescription() { return description; }
+    public String getAcl()                               {return acl;}
 
-    public void setDescription(String description) { this.description = description; }
+    public void setAcl(String acl)                       {this.acl = acl;}
 
-    public String getAcl() { return acl; }
+    public String getTermsOfUse()                        {return termsOfUse;}
 
-    public void setAcl(String acl) { this.acl = acl; }
+    public void setTermsOfUse(String termsOfUse)         {this.termsOfUse = termsOfUse;}
 
-    public String getTermsOfUse() { return termsOfUse; }
+    public String getOptions()                           {return options;}
 
-    public void setTermsOfUse(String termsOfUse) { this.termsOfUse = termsOfUse; }
+    public void setOptions(String options)               {this.options = options;}
 
-    public String getOptions() { return options; }
+    public String getAdditionalInfo()                    {return additionalInfo;}
 
-    public void setOptions(String options) { this.options = options; }
+    public void setAdditionalInfo(String additionalInfo) {this.additionalInfo = additionalInfo;}
 
-    public String getAdditionalInfo() { return additionalInfo; }
+    @Override
+    public int getMyClassType() {return AppConstants.CLASS_TYPE_GDS_PROJECT;}
 
-    public void setAdditionalInfo(String additionalInfo) { this.additionalInfo = additionalInfo; }
+    @Override
+    public Long getId() {return id;}
 
     @Override
-    public int getMyClassType() { return AppConstants.CLASS_TYPE_GDS_PROJECT; }
+    public void setId(Long id) {this.id = id;}
 
     @Override
     public int hashCode() {
@@ -130,15 +139,15 @@ public class XXGdsProject extends XXDBBase implements Serializable {
         XXGdsProject other = (XXGdsProject) obj;
 
         return Objects.equals(id, other.id) &&
-               Objects.equals(guid, other.guid) &&
-               Objects.equals(version, other.version) &&
-               Objects.equals(isEnabled, other.isEnabled) &&
-               Objects.equals(name, other.name) &&
-               Objects.equals(description, other.description) &&
-               Objects.equals(acl, other.acl) &&
-               Objects.equals(termsOfUse, other.termsOfUse) &&
-               Objects.equals(options, other.options) &&
-               Objects.equals(additionalInfo, other.additionalInfo);
+                Objects.equals(guid, other.guid) &&
+                Objects.equals(version, other.version) &&
+                Objects.equals(isEnabled, other.isEnabled) &&
+                Objects.equals(name, other.name) &&
+                Objects.equals(description, other.description) &&
+                Objects.equals(acl, other.acl) &&
+                Objects.equals(termsOfUse, other.termsOfUse) &&
+                Objects.equals(options, other.options) &&
+                Objects.equals(additionalInfo, other.additionalInfo);
     }
 
     @Override
@@ -148,18 +157,18 @@ public class XXGdsProject extends XXDBBase implements Serializable {
 
     public StringBuilder toString(StringBuilder sb) {
         sb.append("XXGdsProject={ ")
-          .append(super.toString()).append(" ")
-          .append("id={").append(id).append("} ")
-          .append("guid={").append(guid).append("} ")
-          .append("version={").append(version).append("} ")
-          .append("isEnabled={").append(isEnabled).append("} ")
-          .append("name={").append(name).append("} ")
-          .append("description={").append(description).append("} ")
-          .append("condition={").append(acl).append("} ")
-          .append("termsOfUse={").append(termsOfUse).append("} ")
-          .append("options={").append(options).append("} ")
-          .append("additionalInfo={").append(additionalInfo).append("} ")
-          .append(" }");
+                .append(super.toString()).append(" ")
+                .append("id={").append(id).append("} ")
+                .append("guid={").append(guid).append("} ")
+                .append("version={").append(version).append("} ")
+                .append("isEnabled={").append(isEnabled).append("} ")
+                .append("name={").append(name).append("} ")
+                .append("description={").append(description).append("} ")
+                .append("condition={").append(acl).append("} ")
+                .append("termsOfUse={").append(termsOfUse).append("} ")
+                .append("options={").append(options).append("} ")
+                .append("additionalInfo={").append(additionalInfo).append("} ")
+                .append(" }");
 
         return sb;
     }
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXGdsProjectPolicyMap.java b/security-admin/src/main/java/org/apache/ranger/entity/XXGdsProjectPolicyMap.java
index e7f1358ad..a7853ca3b 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXGdsProjectPolicyMap.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXGdsProjectPolicyMap.java
@@ -21,14 +21,22 @@ package org.apache.ranger.entity;
 
 import org.apache.ranger.common.AppConstants;
 
-import javax.persistence.*;
+import javax.persistence.Cacheable;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
 import javax.xml.bind.annotation.XmlRootElement;
+
 import java.io.Serializable;
 import java.util.Objects;
 
 @Entity
 @Cacheable
-@Table(name="x_gds_project_policy_map")
+@Table(name = "x_gds_project_policy_map")
 @XmlRootElement
 public class XXGdsProjectPolicyMap implements Serializable {
     private static final long serialVersionUID = 1L;
@@ -45,26 +53,26 @@ public class XXGdsProjectPolicyMap implements Serializable {
     @Column(name = "policy_id")
     protected Long policyId;
 
-    public XXGdsProjectPolicyMap() { }
+    public XXGdsProjectPolicyMap() {}
 
     public XXGdsProjectPolicyMap(Long projectId, Long policyId) {
         setProjectId(projectId);
         setPolicyId(policyId);
     }
 
-    public void setId(Long id) { this.id = id; }
+    public Long getId()                      {return id;}
 
-    public Long getId() { return id; }
+    public void setId(Long id)               {this.id = id;}
 
-    public Long getProjectId() { return projectId; }
+    public Long getProjectId()               {return projectId;}
 
-    public void setProjectId(Long projectId) { this.projectId = projectId; }
+    public void setProjectId(Long projectId) {this.projectId = projectId;}
 
-    public Long getPolicyId() { return policyId; }
+    public Long getPolicyId()                {return policyId;}
 
-    public void setPolicyId(Long policyId) { this.policyId = policyId; }
+    public void setPolicyId(Long policyId)   {this.policyId = policyId;}
 
-    public int getMyClassType() { return AppConstants.CLASS_TYPE_GDS_PROJECT_POLICY_MAP; }
+    public int getMyClassType()              {return AppConstants.CLASS_TYPE_GDS_PROJECT_POLICY_MAP;}
 
     @Override
     public int hashCode() {
@@ -84,8 +92,8 @@ public class XXGdsProjectPolicyMap implements Serializable {
         XXGdsProjectPolicyMap other = (XXGdsProjectPolicyMap) obj;
 
         return Objects.equals(id, other.id) &&
-               Objects.equals(projectId, other.projectId) &&
-               Objects.equals(policyId, other.policyId);
+                Objects.equals(projectId, other.projectId) &&
+                Objects.equals(policyId, other.policyId);
     }
 
     @Override
@@ -95,11 +103,11 @@ public class XXGdsProjectPolicyMap implements Serializable {
 
     public StringBuilder toString(StringBuilder sb) {
         sb.append("XXGdsProjectPolicyMap={ ")
-          .append(super.toString() + "} ")
-          .append("id={").append(id).append("} ")
-          .append("projectId={").append(projectId).append("} ")
-          .append("policyId={").append(policyId).append("} ")
-          .append(" }");
+                .append(super.toString() + "} ")
+                .append("id={").append(id).append("} ")
+                .append("projectId={").append(projectId).append("} ")
+                .append("policyId={").append(policyId).append("} ")
+                .append(" }");
 
         return sb;
     }
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXGdsSharedResource.java b/security-admin/src/main/java/org/apache/ranger/entity/XXGdsSharedResource.java
index b6096f217..c7c01b26a 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXGdsSharedResource.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXGdsSharedResource.java
@@ -21,14 +21,23 @@ package org.apache.ranger.entity;
 
 import org.apache.ranger.common.AppConstants;
 
-import javax.persistence.*;
+import javax.persistence.Cacheable;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import javax.persistence.Version;
 import javax.xml.bind.annotation.XmlRootElement;
+
 import java.io.Serializable;
 import java.util.Objects;
 
 @Entity
 @Cacheable
-@Table(name="x_gds_shared_resource")
+@Table(name = "x_gds_shared_resource")
 @XmlRootElement
 public class XXGdsSharedResource extends XXDBBase implements Serializable {
     private static final long serialVersionUID = 1L;
@@ -91,83 +100,82 @@ public class XXGdsSharedResource extends XXDBBase implements Serializable {
     @Column(name = "additional_info")
     protected String additionalInfo;
 
+    public String getGuid()                                    {return guid;}
 
-    @Override
-    public void setId(Long id) { this.id = id; }
-
-    @Override
-    public Long getId() { return id; }
+    public void setGuid(String guid)                           {this.guid = guid;}
 
-    public String getGuid() { return guid; }
+    public Long getVersion()                                   {return version;}
 
-    public void setGuid(String guid) { this.guid = guid; }
+    public void setVersion(Long version)                       {this.version = version;}
 
-    public Long getVersion() { return version; }
+    public Boolean getIsEnabled()                              {return isEnabled;}
 
-    public void setVersion(Long version) { this.version = version; }
+    public void setIsEnabled(Boolean isEnabled)                {this.isEnabled = isEnabled;}
 
-    public Boolean getIsEnabled() { return isEnabled; }
+    public String getName()                                    {return name;}
 
-    public void setIsEnabled(Boolean isEnabled) { this.isEnabled = isEnabled; }
+    public void setName(String name)                           {this.name = name;}
 
-    public String getName() { return name; }
+    public String getDescription()                             {return description;}
 
-    public void setName(String name) { this.name = name; }
+    public void setDescription(String description)             {this.description = description;}
 
-    public String getDescription() { return description; }
+    public Long getDataShareId()                               {return dataShareId;}
 
-    public void setDescription(String description) { this.description = description; }
+    public void setDataShareId(Long dataShareId)               {this.dataShareId = dataShareId;}
 
-    public Long getDataShareId() { return dataShareId; }
+    public String getResource()                                {return resource;}
 
-    public void setDataShareId(Long dataShareId) { this.dataShareId = dataShareId; }
+    public void setResource(String resource)                   {this.resource = resource;}
 
-    public String getResource() { return resource; }
+    public String getSubResource()                             {return subResource;}
 
-    public void setResource(String resource) { this.resource = resource; }
+    public void setSubResource(String subResource)             {this.subResource = subResource;}
 
-    public String getSubResource() { return subResource; }
+    public String getSubResourceType()                         {return subResourceType;}
 
-    public void setSubResource(String subResource) {this.subResource = subResource; }
+    public void setSubResourceType(String subResourceType)     {this.subResourceType = subResourceType;}
 
-    public String getSubResourceType() { return subResourceType; }
+    public String getResourceSignature()                       {return resourceSignature;}
 
-    public void setSubResourceType(String subResourceType) {this.subResourceType = subResourceType; }
+    public void setResourceSignature(String resourceSignature) {this.resourceSignature = resourceSignature;}
 
-    public String getResourceSignature() { return resourceSignature; }
+    public String getConditionExpr()                           {return conditionExpr;}
 
-    public void setResourceSignature(String resourceSignature) { this.resourceSignature = resourceSignature; }
+    public void setConditionExpr(String conditionExpr)         {this.conditionExpr = conditionExpr;}
 
-    public String getConditionExpr() { return conditionExpr; }
+    public String getAccessTypes()                             {return accessTypes;}
 
-    public void setConditionExpr(String conditionExpr) { this.conditionExpr = conditionExpr; }
+    public void setAccessTypes(String accessTypes)             {this.accessTypes = accessTypes;}
 
-    public String getAccessTypes() { return accessTypes; }
+    public String getRowFilter()                               {return rowFilter;}
 
-    public void setAccessTypes(String accessTypes) { this.accessTypes = accessTypes; }
+    public void setRowFilter(String rowFilter)                 {this.rowFilter = rowFilter;}
 
-    public String getRowFilter() { return rowFilter; }
+    public String getSubResourceMasks()                        {return subResourceMasks;}
 
-    public void setRowFilter(String rowFilter) { this.rowFilter = rowFilter; }
+    public void setSubResourceMasks(String subResourceMasks)   {this.subResourceMasks = subResourceMasks;}
 
-    public String getSubResourceMasks() { return subResourceMasks; }
+    public String getProfiles()                                {return profiles;}
 
-    public void setSubResourceMasks(String subResourceMasks) { this.subResourceMasks = subResourceMasks; }
+    public void setProfiles(String profiles)                   {this.profiles = profiles;}
 
-    public String getProfiles() { return profiles; }
+    public String getOptions()                                 {return options;}
 
-    public void setProfiles(String profiles) { this.profiles = profiles; }
+    public void setOptions(String options)                     {this.options = options;}
 
-    public String getOptions() { return options; }
+    public String getAdditionalInfo()                          {return additionalInfo;}
 
-    public void setOptions(String options) { this.options = options; }
+    public void setAdditionalInfo(String additionalInfo)       {this.additionalInfo = additionalInfo;}
 
-    public String getAdditionalInfo() { return additionalInfo; }
+    @Override
+    public int getMyClassType() {return AppConstants.CLASS_TYPE_GDS_SHARED_RESOURCE;}
 
-    public void setAdditionalInfo(String additionalInfo) { this.additionalInfo = additionalInfo; }
+    @Override
+    public Long getId() {return id;}
 
     @Override
-    public int getMyClassType() { return AppConstants.CLASS_TYPE_GDS_SHARED_RESOURCE; }
+    public void setId(Long id) {this.id = id;}
 
     @Override
     public int hashCode() {
@@ -187,23 +195,23 @@ public class XXGdsSharedResource extends XXDBBase implements Serializable {
         XXGdsSharedResource other = (XXGdsSharedResource) obj;
 
         return Objects.equals(id, other.id) &&
-               Objects.equals(guid, other.guid) &&
-               Objects.equals(version, other.version) &&
-               Objects.equals(isEnabled, other.isEnabled) &&
-               Objects.equals(name, other.name) &&
-               Objects.equals(description, other.description) &&
-               Objects.equals(dataShareId, other.dataShareId) &&
-               Objects.equals(resource, other.resource) &&
-               Objects.equals(subResource, other.subResource) &&
-               Objects.equals(subResourceType, other.subResourceType) &&
-               Objects.equals(resourceSignature, other.resourceSignature) &&
-               Objects.equals(conditionExpr, other.conditionExpr) &&
-               Objects.equals(accessTypes, other.accessTypes) &&
-               Objects.equals(rowFilter, other.rowFilter) &&
-               Objects.equals(subResourceMasks, other.subResourceMasks) &&
-               Objects.equals(profiles, other.profiles) &&
-               Objects.equals(options, other.options) &&
-               Objects.equals(additionalInfo, other.additionalInfo);
+                Objects.equals(guid, other.guid) &&
+                Objects.equals(version, other.version) &&
+                Objects.equals(isEnabled, other.isEnabled) &&
+                Objects.equals(name, other.name) &&
+                Objects.equals(description, other.description) &&
+                Objects.equals(dataShareId, other.dataShareId) &&
+                Objects.equals(resource, other.resource) &&
+                Objects.equals(subResource, other.subResource) &&
+                Objects.equals(subResourceType, other.subResourceType) &&
+                Objects.equals(resourceSignature, other.resourceSignature) &&
+                Objects.equals(conditionExpr, other.conditionExpr) &&
+                Objects.equals(accessTypes, other.accessTypes) &&
+                Objects.equals(rowFilter, other.rowFilter) &&
+                Objects.equals(subResourceMasks, other.subResourceMasks) &&
+                Objects.equals(profiles, other.profiles) &&
+                Objects.equals(options, other.options) &&
+                Objects.equals(additionalInfo, other.additionalInfo);
     }
 
     @Override
@@ -213,26 +221,26 @@ public class XXGdsSharedResource extends XXDBBase implements Serializable {
 
     public StringBuilder toString(StringBuilder sb) {
         sb.append("XXGdsSharedResource={ ")
-          .append(super.toString()).append(" ")
-          .append("id={").append(id).append("} ")
-          .append("guid={").append(guid).append("} ")
-          .append("version={").append(version).append("} ")
-          .append("isEnabled={").append(isEnabled).append("} ")
-          .append("description={").append(description).append("} ")
-          .append("name={").append(name).append("} ")
-          .append("description={").append(description).append("} ")
-          .append("dataShareId={").append(dataShareId).append("} ")
-          .append("resource={").append(resource).append("} ")
-          .append("subResource={").append(subResource).append("} ")
-          .append("subResourceType={").append(subResourceType).append("} ")
-          .append("conditionExpr={").append(conditionExpr).append("} ")
-          .append("accessTypes={").append(accessTypes).append("} ")
-          .append("rowFilter={").append(rowFilter).append("} ")
-          .append("subResourceMasks={").append(subResourceMasks).append("} ")
-          .append("profiles={").append(profiles).append("} ")
-          .append("options={").append(options).append("} ")
-          .append("additionalInfo={").append(additionalInfo).append("} ")
-          .append(" }");
+                .append(super.toString()).append(" ")
+                .append("id={").append(id).append("} ")
+                .append("guid={").append(guid).append("} ")
+                .append("version={").append(version).append("} ")
+                .append("isEnabled={").append(isEnabled).append("} ")
+                .append("description={").append(description).append("} ")
+                .append("name={").append(name).append("} ")
+                .append("description={").append(description).append("} ")
+                .append("dataShareId={").append(dataShareId).append("} ")
+                .append("resource={").append(resource).append("} ")
+                .append("subResource={").append(subResource).append("} ")
+                .append("subResourceType={").append(subResourceType).append("} ")
+                .append("conditionExpr={").append(conditionExpr).append("} ")
+                .append("accessTypes={").append(accessTypes).append("} ")
+                .append("rowFilter={").append(rowFilter).append("} ")
+                .append("subResourceMasks={").append(subResourceMasks).append("} ")
+                .append("profiles={").append(profiles).append("} ")
+                .append("options={").append(options).append("} ")
+                .append("additionalInfo={").append(additionalInfo).append("} ")
+                .append(" }");
 
         return sb;
     }
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXGlobalState.java b/security-admin/src/main/java/org/apache/ranger/entity/XXGlobalState.java
index 2bec48fed..c48712229 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXGlobalState.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXGlobalState.java
@@ -25,6 +25,7 @@ import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
+
 import java.util.Objects;
 
 @Entity
@@ -36,26 +37,29 @@ public class XXGlobalState extends XXGlobalStateBase implements java.io.Serializ
     @SequenceGenerator(name = "x_ranger_global_state_SEQ", sequenceName = "x_ranger_global_state_SEQ", allocationSize = 1)
     @GeneratedValue(strategy = GenerationType.AUTO, generator = "x_ranger_global_state_SEQ")
     @Column(name = "id")
-    protected Long id;
+    protected            Long id;
 
     @Override
-    public void setId(Long id) {
-        this.id = id;
+    public Long getId() {
+        return id;
     }
 
     @Override
-    public Long getId() {
-        return id;
+    public void setId(Long id) {
+        this.id = id;
     }
 
     @Override
     public boolean equals(Object obj) {
-        if (this == obj)
+        if (this == obj) {
             return true;
-        if (getClass() != obj.getClass())
+        }
+        if (getClass() != obj.getClass()) {
             return false;
-        if (!super.equals(obj))
+        }
+        if (!super.equals(obj)) {
             return false;
+        }
 
         XXGlobalState other = (XXGlobalState) obj;
 
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXGlobalStateBase.java b/security-admin/src/main/java/org/apache/ranger/entity/XXGlobalStateBase.java
index a1a39c672..88fc443ef 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXGlobalStateBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXGlobalStateBase.java
@@ -20,6 +20,7 @@ package org.apache.ranger.entity;
 import javax.persistence.Column;
 import javax.persistence.MappedSuperclass;
 import javax.persistence.Version;
+
 import java.util.Objects;
 
 @MappedSuperclass
@@ -36,15 +37,22 @@ public abstract class XXGlobalStateBase extends XXDBBase {
     @Column(name = "app_data")
     protected String appData;
 
-    public Long getVersion() { return version; }
-    public String getStateName() { return stateName; }
+    public Long getVersion()     {return version;}
+
+    public String getStateName() {return stateName;}
 
     public void setStateName(String stateName) {
         this.stateName = stateName;
     }
 
+    public String getAppData()             {return appData;}
+
     public void setAppData(String appData) {this.appData = appData;}
-    public String getAppData() { return appData; }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(super.hashCode(), version, stateName);
+    }
 
     @Override
     public boolean equals(Object obj) {
@@ -65,11 +73,6 @@ public abstract class XXGlobalStateBase extends XXDBBase {
                 Objects.equals(appData, other.appData);
     }
 
-    @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode(), version, stateName);
-    }
-
     @Override
     public String toString() {
         String str = "XXGlobalStateBase={";
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXGroup.java b/security-admin/src/main/java/org/apache/ranger/entity/XXGroup.java
index 179b7f95c..adb6587d7 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXGroup.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXGroup.java
@@ -17,13 +17,16 @@
  * under the License.
  */
 
- package org.apache.ranger.entity;
+package org.apache.ranger.entity;
 
 /**
  * Group
- *
  */
 
+import org.apache.ranger.common.AppConstants;
+import org.apache.ranger.common.RangerCommonEnums;
+import org.apache.ranger.common.RangerConstants;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -32,321 +35,312 @@ import javax.persistence.Id;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 
-import org.apache.ranger.common.AppConstants;
-import org.apache.ranger.common.RangerCommonEnums;
-import org.apache.ranger.common.RangerConstants;
-
-
 @Entity
-@Table(name="x_group")
+@Table(name = "x_group")
 public class XXGroup extends XXDBBase implements java.io.Serializable {
-	private static final long serialVersionUID = 1L;
-
-	@Id
-	@SequenceGenerator(name="X_GROUP_SEQ",sequenceName="X_GROUP_SEQ",allocationSize=1)
-	@GeneratedValue(strategy=GenerationType.AUTO,generator="X_GROUP_SEQ")
-	@Column(name="ID")
-	protected Long id;
-	@Override
-	public void setId(Long id) {
-		this.id=id;
-	}
-	@Override
-	public Long getId() {
-		return id;
-	}
-	/**
-	 * Name
-	 * <ul>
-	 * <li>The maximum length for this attribute is <b>1024</b>.
-	 * </ul>
-	 *
-	 */
-	@Column(name="GROUP_NAME"  , nullable=false , length=1024)
-	protected String name;
-
-	/**
-	 * Description
-	 * <ul>
-	 * <li>The maximum length for this attribute is <b>4000</b>.
-	 * </ul>
-	 *
-	 */
-	@Column(name="DESCR"  , nullable=false , length=4000)
-	protected String description;
-
-	/**
-	 * Status
-	 * <ul>
-	 * <li>This attribute is of type enum CommonEnums::ActiveStatus
-	 * </ul>
-	 *
-	 */
-	@Column(name="STATUS"  , nullable=false )
-	protected int status = RangerConstants.STATUS_DISABLED;
-	
-	/**
-	 * IsVisible
-	 * <ul>
-	 * <li>This attribute is of type enum CommonEnums::ActiveVisiblility
-	 * </ul>
-	 *
-	 */
-	@Column(name="IS_VISIBLE"  , nullable=false )
-	protected Integer isVisible;
-
-	/**
-	 * Type of group
-	 * <ul>
-	 * <li>This attribute is of type enum CommonEnums::XAGroupType
-	 * </ul>
-	 *
-	 */
-	@Column(name="GROUP_TYPE"  , nullable=false )
-	protected int groupType = AppConstants.XA_GROUP_UNKNOWN;
-	
-	@Column(name="GROUP_SRC"  , nullable=false )
-	protected int groupSource = RangerCommonEnums.GROUP_INTERNAL;
-
-	/**
-	 * Id of the credential store
-	 * <ul>
-	 * </ul>
... 31028 lines suppressed ...