You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by ab...@apache.org on 2017/03/16 20:25:14 UTC
ranger git commit: RANGER-1463: Good coding practices per static code
analysis
Repository: ranger
Updated Branches:
refs/heads/master f310aaf6b -> d534b1637
RANGER-1463: Good coding practices per static code analysis
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/d534b163
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/d534b163
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/d534b163
Branch: refs/heads/master
Commit: d534b16379bcc9b3f48a8c3bf07551ced974909f
Parents: f310aaf
Author: Abhay Kulkarni <ak...@hortonworks.com>
Authored: Thu Mar 16 13:12:05 2017 -0700
Committer: Abhay Kulkarni <ak...@hortonworks.com>
Committed: Thu Mar 16 13:12:05 2017 -0700
----------------------------------------------------------------------
.../plugin/service/RangerBaseService.java | 11 ++++-----
.../org/apache/ranger/biz/ServiceDBStore.java | 25 +++++++++++---------
2 files changed, 19 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ranger/blob/d534b163/agents-common/src/main/java/org/apache/ranger/plugin/service/RangerBaseService.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/service/RangerBaseService.java b/agents-common/src/main/java/org/apache/ranger/plugin/service/RangerBaseService.java
index 9955051..f1c6b9f 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/service/RangerBaseService.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/service/RangerBaseService.java
@@ -217,21 +217,20 @@ public abstract class RangerBaseService {
}
private String buildPolicyName(List<RangerServiceDef.RangerResourceDef> resourceHierarchy) {
- String ret = "all";
+ StringBuilder sb = new StringBuilder("all");
if (CollectionUtils.isNotEmpty(resourceHierarchy)) {
int resourceDefCount = 0;
for (RangerServiceDef.RangerResourceDef resourceDef : resourceHierarchy) {
if (resourceDefCount > 0) {
- ret += ", ";
+ sb.append(", ");
} else {
- ret += " - ";
+ sb.append(" - ");
}
- ret += resourceDef.getName();
+ sb.append(resourceDef.getName());
resourceDefCount++;
}
- ret = ret.trim();
}
- return ret;
+ return sb.toString().trim();
}
private List<String> getUserList() {
http://git-wip-us.apache.org/repos/asf/ranger/blob/d534b163/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 26080b5..2a9c003 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
@@ -2449,24 +2449,27 @@ public class ServiceDBStore extends AbstractServiceStore {
RangerBaseService svc = serviceMgr.getRangerServiceByService(createdService, this);
- List<String> serviceCheckUsers = getServiceCheckUsers(createdService);
+ if (svc != null) {
- List<RangerPolicy.RangerPolicyItemAccess> allAccesses = svc.getAndAllowAllAccesses();
+ List<String> serviceCheckUsers = getServiceCheckUsers(createdService);
- for (RangerPolicy defaultPolicy : svc.getDefaultRangerPolicies()) {
+ List<RangerPolicy.RangerPolicyItemAccess> allAccesses = svc.getAndAllowAllAccesses();
- if (CollectionUtils.isNotEmpty(serviceCheckUsers)
- && StringUtils.equalsIgnoreCase(defaultPolicy.getService(), createdService.getName())) {
+ for (RangerPolicy defaultPolicy : svc.getDefaultRangerPolicies()) {
- RangerPolicy.RangerPolicyItem policyItem = new RangerPolicy.RangerPolicyItem();
+ if (CollectionUtils.isNotEmpty(serviceCheckUsers)
+ && StringUtils.equalsIgnoreCase(defaultPolicy.getService(), createdService.getName())) {
- policyItem.setUsers(serviceCheckUsers);
- policyItem.setAccesses(allAccesses);
- policyItem.setDelegateAdmin(true);
+ RangerPolicy.RangerPolicyItem policyItem = new RangerPolicy.RangerPolicyItem();
- defaultPolicy.getPolicyItems().add(policyItem);
+ policyItem.setUsers(serviceCheckUsers);
+ policyItem.setAccesses(allAccesses);
+ policyItem.setDelegateAdmin(true);
+
+ defaultPolicy.getPolicyItems().add(policyItem);
+ }
+ createPolicy(defaultPolicy);
}
- createPolicy(defaultPolicy);
}
}