You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by ma...@apache.org on 2015/12/14 18:48:18 UTC
incubator-ranger git commit: RANGER-779: unused attributes removed
from RangerPolicyItem
Repository: incubator-ranger
Updated Branches:
refs/heads/master 6194ea0c4 -> e2c638c9d
RANGER-779: unused attributes removed from RangerPolicyItem
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/e2c638c9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/e2c638c9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/e2c638c9
Branch: refs/heads/master
Commit: e2c638c9d361dd3b5b7a1c5e44c26c05b2278f74
Parents: 6194ea0
Author: Madhan Neethiraj <ma...@apache.org>
Authored: Fri Dec 11 15:22:18 2015 -0800
Committer: Madhan Neethiraj <ma...@apache.org>
Committed: Mon Dec 14 09:48:04 2015 -0800
----------------------------------------------------------------------
.../ranger/plugin/model/RangerPolicy.java | 44 --------------------
.../RangerAbstractPolicyItemEvaluator.java | 2 +-
.../ranger/biz/RangerPolicyRetriever.java | 2 -
.../org/apache/ranger/biz/ServiceDBStore.java | 4 +-
4 files changed, 3 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/e2c638c9/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPolicy.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPolicy.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPolicy.java
index c6ce667..eac8be8 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPolicy.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPolicy.java
@@ -593,8 +593,6 @@ public class RangerPolicy extends RangerBaseModelObject implements java.io.Seria
private List<String> groups = null;
private List<RangerPolicyItemCondition> conditions = null;
private Boolean delegateAdmin = null;
- private Boolean isEnabled = Boolean.TRUE;
- private String comments = null;
public RangerPolicyItem() {
this(null, null, null, null, null);
@@ -719,34 +717,6 @@ public class RangerPolicy extends RangerBaseModelObject implements java.io.Seria
this.delegateAdmin = delegateAdmin == null ? Boolean.FALSE : delegateAdmin;
}
- /**
- * @return the isEnabled
- */
- public Boolean getIsEnabled() {
- return isEnabled;
- }
-
- /**
- * @param isEnabled the isEnabled to set
- */
- public void setIsEnabled(Boolean isEnabled) {
- this.isEnabled = isEnabled == null ? Boolean.TRUE : isEnabled;
- }
-
- /**
- * @return the comments
- */
- public String getComments() {
- return comments;
- }
-
- /**
- * @param comments the comments to set
- */
- public void setComments(String comments) {
- this.comments = comments;
- }
-
@Override
public String toString( ) {
StringBuilder sb = new StringBuilder();
@@ -800,8 +770,6 @@ public class RangerPolicy extends RangerBaseModelObject implements java.io.Seria
sb.append("} ");
sb.append("delegateAdmin={").append(delegateAdmin).append("} ");
- sb.append("isEnabled={").append(isEnabled).append("} ");
- sb.append("comments={").append(comments).append("} ");
sb.append("}");
return sb;
@@ -817,8 +785,6 @@ public class RangerPolicy extends RangerBaseModelObject implements java.io.Seria
+ ((conditions == null) ? 0 : conditions.hashCode());
result = prime * result
+ ((delegateAdmin == null) ? 0 : delegateAdmin.hashCode());
- result = prime * result + ((isEnabled == null) ? 0 : isEnabled.hashCode());
- result = prime * result + ((comments == null) ? 0 : comments.hashCode());
result = prime * result
+ ((groups == null) ? 0 : groups.hashCode());
result = prime * result + ((users == null) ? 0 : users.hashCode());
@@ -849,16 +815,6 @@ public class RangerPolicy extends RangerBaseModelObject implements java.io.Seria
return false;
} else if (!delegateAdmin.equals(other.delegateAdmin))
return false;
- if (isEnabled == null) {
- if (other.isEnabled != null)
- return false;
- } else if (!isEnabled.equals(other.isEnabled))
- return false;
- if (comments == null) {
- if (other.comments != null)
- return false;
- } else if (!comments.equals(other.comments))
- return false;
if (groups == null) {
if (other.groups != null)
return false;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/e2c638c9/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerAbstractPolicyItemEvaluator.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerAbstractPolicyItemEvaluator.java b/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerAbstractPolicyItemEvaluator.java
index d592182..514884f 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerAbstractPolicyItemEvaluator.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerAbstractPolicyItemEvaluator.java
@@ -90,7 +90,7 @@ public abstract class RangerAbstractPolicyItemEvaluator implements RangerPolicyI
@Override
public String getComments() {
- return policyItem == null ? null : policyItem.getComments();
+ return null;
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/e2c638c9/security-admin/src/main/java/org/apache/ranger/biz/RangerPolicyRetriever.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/RangerPolicyRetriever.java b/security-admin/src/main/java/org/apache/ranger/biz/RangerPolicyRetriever.java
index 6e164f3..517de20 100644
--- a/security-admin/src/main/java/org/apache/ranger/biz/RangerPolicyRetriever.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/RangerPolicyRetriever.java
@@ -580,8 +580,6 @@ public class RangerPolicyRetriever {
RangerPolicyItem policyItem = new RangerPolicyItem();
policyItem.setDelegateAdmin(xPolicyItem.getDelegateAdmin());
- policyItem.setIsEnabled(xPolicyItem.getIsEnabled());
- policyItem.setComments(xPolicyItem.getComments());
while(iterUserPerms.hasNext()) {
XXPolicyItemUserPerm xUserPerm = iterUserPerms.next();
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/e2c638c9/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java b/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
index 0ee3595..54e61f1 100644
--- a/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
@@ -2049,8 +2049,8 @@ public class ServiceDBStore extends AbstractServiceStore {
xPolicyItem, xPolicy);
xPolicyItem.setDelegateAdmin(policyItem.getDelegateAdmin());
xPolicyItem.setItemType(policyItemType);
- xPolicyItem.setIsEnabled(policyItem.getIsEnabled());
- xPolicyItem.setComments(policyItem.getComments());
+ xPolicyItem.setIsEnabled(Boolean.TRUE);
+ xPolicyItem.setComments(null);
xPolicyItem.setPolicyId(policy.getId());
xPolicyItem.setOrder(itemOrder);
xPolicyItem = daoMgr.getXXPolicyItem().create(xPolicyItem);