Repository: incubator-ranger Updated Branches: refs/heads/master f01ac18f3 -> 8cedfa55c
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/8cedfa55/security-admin/src/main/java/org/apache/ranger/entity/XXResourceDef.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXResourceDef.java b/security-admin/src/main/java/org/apache/ranger/entity/XXResourceDef.java index 5974033..54f716d 100644 --- a/security-admin/src/main/java/org/apache/ranger/entity/XXResourceDef.java +++ b/security-admin/src/main/java/org/apache/ranger/entity/XXResourceDef.java @@ -49,6 +49,15 @@ public class XXResourceDef extends XXDBBase implements java.io.Serializable { protected Long defId; /** + * itemId of the XXResourceDef + * <ul> + * </ul> + * + */ + @Column(name = "item_id") + protected Long itemId; + + /** * name of the XXResourceDef * <ul> * </ul> @@ -251,6 +260,26 @@ public class XXResourceDef extends XXDBBase implements java.io.Serializable { } /** + * 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>defId</b> * * @return Date - value of member attribute <b>defId</b> . @@ -639,6 +668,13 @@ public class XXResourceDef extends XXDBBase implements java.io.Serializable { } 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 (description == null) { if (other.description != null) { return false; @@ -754,7 +790,7 @@ public class XXResourceDef extends XXDBBase implements java.io.Serializable { @Override public String toString() { return "XXResourceDef [" + super.toString() + " id=" + id + ", defId=" - + defId + ", name=" + name + ", type=" + type + ", level=" + + defId + ", itemId=" + itemId + ", name=" + name + ", type=" + type + ", level=" + level + ", parent=" + parent + ", mandatory=" + mandatory + ", lookUpSupported=" + lookUpSupported + ", recursiveSupported=" + recursiveSupported http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/8cedfa55/security-admin/src/main/java/org/apache/ranger/entity/XXServiceConfigDef.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXServiceConfigDef.java b/security-admin/src/main/java/org/apache/ranger/entity/XXServiceConfigDef.java index a6650d2..825720c 100644 --- a/security-admin/src/main/java/org/apache/ranger/entity/XXServiceConfigDef.java +++ b/security-admin/src/main/java/org/apache/ranger/entity/XXServiceConfigDef.java @@ -48,6 +48,15 @@ public class XXServiceConfigDef extends XXDBBase implements */ @Column(name = "def_id") protected Long defId; + + /** + * itemId of the XXServiceConfigDef + * <ul> + * </ul> + * + */ + @Column(name = "item_id") + protected Long itemId; /** * name of the XXServiceConfigDef @@ -214,6 +223,26 @@ public class XXServiceConfigDef extends XXDBBase implements 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 @@ -498,6 +527,13 @@ public class XXServiceConfigDef extends XXDBBase implements } 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 (defaultValue == null) { if (other.defaultValue != null) { return false; @@ -592,6 +628,7 @@ public class XXServiceConfigDef extends XXDBBase implements public String toString() { return "XXServiceConfigDef [" + super.toString() + " id=" + id + ", defId=" + defId + ", name=" + name + ", type=" + type + + ", itemId=" + itemId + ", subType=" + subType + ", isMandatory=" + isMandatory + ", defaultValue=" + defaultValue + ", label=" + label + ", validationRegEx=" + validationRegEx http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/8cedfa55/security-admin/src/main/java/org/apache/ranger/service/RangerServiceDefServiceBase.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/service/RangerServiceDefServiceBase.java b/security-admin/src/main/java/org/apache/ranger/service/RangerServiceDefServiceBase.java index d3f0d7b..f6a24aa 100644 --- a/security-admin/src/main/java/org/apache/ranger/service/RangerServiceDefServiceBase.java +++ b/security-admin/src/main/java/org/apache/ranger/service/RangerServiceDefServiceBase.java @@ -103,12 +103,9 @@ public abstract class RangerServiceDefServiceBase<T extends XXServiceDef, V exte throw restErrorUtil.createRESTException("RangerServiceDef cannot be null.", MessageEnums.DATA_NOT_FOUND); } - if(operationContext == OPERATION_UPDATE_CONTEXT) { - xObj.setId(vObj.getId()); - } - xObj = (XXServiceConfigDef) rangerAuditFields.populateAuditFields(xObj, serviceDef); xObj.setDefid(serviceDef.getId()); + xObj.setItemId(vObj.getItemId()); xObj.setName(vObj.getName()); xObj.setType(vObj.getType()); xObj.setSubtype(vObj.getSubType()); @@ -128,7 +125,7 @@ public abstract class RangerServiceDefServiceBase<T extends XXServiceDef, V exte public RangerServiceConfigDef populateXXToRangerServiceConfigDef(XXServiceConfigDef xObj) { RangerServiceConfigDef vObj = new RangerServiceConfigDef(); - vObj.setId(xObj.getId()); + vObj.setItemId(xObj.getItemId()); vObj.setName(xObj.getName()); vObj.setType(xObj.getType()); vObj.setSubType(xObj.getSubtype()); @@ -152,12 +149,9 @@ public abstract class RangerServiceDefServiceBase<T extends XXServiceDef, V exte throw restErrorUtil.createRESTException("RangerServiceDef cannot be null.", MessageEnums.DATA_NOT_FOUND); } - if(operationContext == OPERATION_UPDATE_CONTEXT) { - xObj.setId(vObj.getId()); - } - xObj = (XXResourceDef) rangerAuditFields.populateAuditFields(xObj, serviceDef); xObj.setDefid(serviceDef.getId()); + xObj.setItemId(vObj.getItemId()); xObj.setName(vObj.getName()); xObj.setType(vObj.getType()); xObj.setLevel(vObj.getLevel()); @@ -181,7 +175,7 @@ public abstract class RangerServiceDefServiceBase<T extends XXServiceDef, V exte public RangerResourceDef populateXXToRangerResourceDef(XXResourceDef xObj) { RangerResourceDef vObj = new RangerResourceDef(); - vObj.setId(xObj.getId()); + vObj.setItemId(xObj.getItemId()); vObj.setName(xObj.getName()); vObj.setType(xObj.getType()); vObj.setLevel(xObj.getLevel()); @@ -214,12 +208,9 @@ public abstract class RangerServiceDefServiceBase<T extends XXServiceDef, V exte throw restErrorUtil.createRESTException("RangerServiceDef cannot be null.", MessageEnums.DATA_NOT_FOUND); } - if(operationContext == OPERATION_UPDATE_CONTEXT) { - xObj.setId(vObj.getId()); - } - xObj = (XXAccessTypeDef) rangerAuditFields.populateAuditFields(xObj, serviceDef); xObj.setDefid(serviceDef.getId()); + xObj.setItemId(vObj.getItemId()); xObj.setName(vObj.getName()); xObj.setLabel(vObj.getLabel()); xObj.setRbkeylabel(vObj.getRbKeyLabel()); @@ -229,7 +220,7 @@ public abstract class RangerServiceDefServiceBase<T extends XXServiceDef, V exte public RangerAccessTypeDef populateXXToRangerAccessTypeDef(XXAccessTypeDef xObj) { RangerAccessTypeDef vObj = new RangerAccessTypeDef(); - vObj.setId(xObj.getId()); + vObj.setItemId(xObj.getItemId()); vObj.setName(xObj.getName()); vObj.setLabel(xObj.getLabel()); vObj.setRbKeyLabel(xObj.getRbkeylabel()); @@ -246,12 +237,9 @@ public abstract class RangerServiceDefServiceBase<T extends XXServiceDef, V exte throw restErrorUtil.createRESTException("RangerServiceDef cannot be null.", MessageEnums.DATA_NOT_FOUND); } - if(operationContext == OPERATION_UPDATE_CONTEXT) { - xObj.setId(vObj.getId()); - } - xObj = (XXPolicyConditionDef) rangerAuditFields.populateAuditFields(xObj, serviceDef); xObj.setDefid(serviceDef.getId()); + xObj.setItemId(vObj.getItemId()); xObj.setName(vObj.getName()); xObj.setEvaluator(vObj.getEvaluator()); xObj.setEvaluatoroptions(mapToJsonString(vObj.getEvaluatorOptions())); @@ -269,7 +257,7 @@ public abstract class RangerServiceDefServiceBase<T extends XXServiceDef, V exte public RangerPolicyConditionDef populateXXToRangerPolicyConditionDef(XXPolicyConditionDef xObj) { RangerPolicyConditionDef vObj = new RangerPolicyConditionDef(); - vObj.setId(xObj.getId()); + vObj.setItemId(xObj.getItemId()); vObj.setName(xObj.getName()); vObj.setEvaluator(xObj.getEvaluator()); vObj.setEvaluatorOptions(jsonStringToMap(xObj.getEvaluatoroptions())); @@ -290,13 +278,10 @@ public abstract class RangerServiceDefServiceBase<T extends XXServiceDef, V exte LOG.error("RangerServiceDefServiceBase.populateRangerContextEnricherDefToXX, serviceDef can not be null"); throw restErrorUtil.createRESTException("RangerServiceDef cannot be null.", MessageEnums.DATA_NOT_FOUND); } - - if(operationContext == OPERATION_UPDATE_CONTEXT) { - xObj.setId(vObj.getId()); - } - + xObj = (XXContextEnricherDef) rangerAuditFields.populateAuditFields(xObj, serviceDef); xObj.setDefid(serviceDef.getId()); + xObj.setItemId(vObj.getItemId()); xObj.setName(vObj.getName()); xObj.setEnricher(vObj.getEnricher()); xObj.setEnricherOptions(mapToJsonString(vObj.getEnricherOptions())); @@ -306,7 +291,7 @@ public abstract class RangerServiceDefServiceBase<T extends XXServiceDef, V exte public RangerContextEnricherDef populateXXToRangerContextEnricherDef(XXContextEnricherDef xObj) { RangerContextEnricherDef vObj = new RangerContextEnricherDef(); - vObj.setId(xObj.getId()); + vObj.setItemId(xObj.getItemId()); vObj.setName(xObj.getName()); vObj.setEnricher(xObj.getEnricher()); vObj.setEnricherOptions(jsonStringToMap(xObj.getEnricherOptions())); @@ -319,13 +304,10 @@ public abstract class RangerServiceDefServiceBase<T extends XXServiceDef, V exte LOG.error("RangerServiceDefServiceBase.populateRangerEnumDefToXX, serviceDef can not be null"); throw restErrorUtil.createRESTException("RangerServiceDef cannot be null.", MessageEnums.DATA_NOT_FOUND); } - - if(operationContext == OPERATION_UPDATE_CONTEXT) { - xObj.setId(vObj.getId()); - } - + xObj = (XXEnumDef) rangerAuditFields.populateAuditFields(xObj, serviceDef); xObj.setDefid(serviceDef.getId()); + xObj.setItemId(vObj.getItemId()); xObj.setName(vObj.getName()); xObj.setDefaultindex(vObj.getDefaultIndex()); return xObj; @@ -333,7 +315,7 @@ public abstract class RangerServiceDefServiceBase<T extends XXServiceDef, V exte public RangerEnumDef populateXXToRangerEnumDef(XXEnumDef xObj) { RangerEnumDef vObj = new RangerEnumDef(); - vObj.setId(xObj.getId()); + vObj.setItemId(xObj.getItemId()); vObj.setName(xObj.getName()); vObj.setDefaultIndex(xObj.getDefaultindex()); @@ -355,13 +337,10 @@ public abstract class RangerServiceDefServiceBase<T extends XXServiceDef, V exte LOG.error("RangerServiceDefServiceBase.populateRangerEnumElementDefToXX, enumDef can not be null"); throw restErrorUtil.createRESTException("enumDef cannot be null.", MessageEnums.DATA_NOT_FOUND); } - - if(operationContext == OPERATION_UPDATE_CONTEXT) { - xObj.setId(vObj.getId()); - } - + xObj = (XXEnumElementDef) rangerAuditFields.populateAuditFields(xObj, enumDef); xObj.setEnumdefid(enumDef.getId()); + xObj.setItemId(vObj.getItemId()); xObj.setName(vObj.getName()); xObj.setLabel(vObj.getLabel()); xObj.setRbkeylabel(vObj.getRbKeyLabel()); @@ -371,7 +350,7 @@ public abstract class RangerServiceDefServiceBase<T extends XXServiceDef, V exte public RangerEnumElementDef populateXXToRangerEnumElementDef(XXEnumElementDef xObj) { RangerEnumElementDef vObj = new RangerEnumElementDef(); - vObj.setId(xObj.getId()); + vObj.setItemId(xObj.getItemId()); vObj.setName(xObj.getName()); vObj.setLabel(xObj.getLabel()); vObj.setRbKeyLabel(xObj.getRbkeylabel());
