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/02/17 09:17:25 UTC
[52/55] [abbrv] incubator-ranger git commit:
Ranger-225:Ranger-LookupResource and ValidateConfig implementation for all
components in the new pluggable model- Additional changes related to usage of
RangerBaseService in RangerService components
Ranger-225:Ranger-LookupResource and ValidateConfig implementation for all components in the new pluggable model- Additional changes related to usage of RangerBaseService in RangerService components
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/d07c61ab
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/d07c61ab
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/d07c61ab
Branch: refs/heads/master
Commit: d07c61ab691e7841bc0bf8e5bf0b9e054a445a92
Parents: a67360d
Author: rmani <rm...@hortonworks.com>
Authored: Fri Feb 13 13:41:27 2015 -0800
Committer: rmani <rm...@hortonworks.com>
Committed: Fri Feb 13 13:41:27 2015 -0800
----------------------------------------------------------------------
.../services/hbase/RangerServiceHBase.java | 19 +++++++------------
.../ranger/services/hdfs/RangerServiceHdfs.java | 14 +++++---------
.../ranger/services/hive/RangerServiceHive.java | 18 +++++++-----------
.../ranger/services/knox/RangerServiceKnox.java | 14 +++++---------
4 files changed, 24 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/d07c61ab/hbase-agent/src/main/java/org/apache/ranger/services/hbase/RangerServiceHBase.java
----------------------------------------------------------------------
diff --git a/hbase-agent/src/main/java/org/apache/ranger/services/hbase/RangerServiceHBase.java b/hbase-agent/src/main/java/org/apache/ranger/services/hbase/RangerServiceHBase.java
index 2c6e311..fe53faf 100644
--- a/hbase-agent/src/main/java/org/apache/ranger/services/hbase/RangerServiceHBase.java
+++ b/hbase-agent/src/main/java/org/apache/ranger/services/hbase/RangerServiceHBase.java
@@ -35,10 +35,8 @@ public class RangerServiceHBase extends RangerBaseService {
private static final Log LOG = LogFactory.getLog(RangerServiceHBase.class);
- RangerService service;
- RangerServiceDef serviceDef;
Map<String, String> configs;
- String serviceName;
+ String service;
public RangerServiceHBase() {
super();
@@ -54,11 +52,11 @@ public class RangerServiceHBase extends RangerBaseService {
public HashMap<String,Object> validateConfig() throws Exception {
HashMap<String, Object> ret = new HashMap<String, Object>();
if(LOG.isDebugEnabled()) {
- LOG.debug("<== RangerServiceHBase.validateConfig() Service: (" + service + " )");
+ LOG.debug("==> RangerServiceHBase.validateConfig() Service: (" + service + " )");
}
if ( configs != null) {
try {
- ret = HBaseResourceMgr.testConnection(service.getName(), service.getConfigs());
+ ret = HBaseResourceMgr.testConnection(service, configs);
} catch (Exception e) {
LOG.error("<== RangerServiceHBase.validateConfig() Error:" + e);
throw e;
@@ -74,15 +72,14 @@ public class RangerServiceHBase extends RangerBaseService {
public List<String> lookupResource(ResourceLookupContext context) throws Exception {
List<String> ret = new ArrayList<String>();
- String svc = service.getName();
if(LOG.isDebugEnabled()) {
- LOG.debug("<== RangerServiceHBase.lookupResource() Service : " + svc + " Context: (" + context + ")");
+ LOG.debug("==> RangerServiceHBase.lookupResource() Service : " + service + " Context: (" + context + ")");
}
if (context != null) {
try {
- ret = HBaseResourceMgr.getHBaseResource(service.getName(),service.getConfigs(),context);
+ ret = HBaseResourceMgr.getHBaseResource(service, configs,context);
} catch (Exception e) {
LOG.error( "<==RangerServiceHBase.lookupResource() Error : " + e);
throw e;
@@ -95,10 +92,8 @@ public class RangerServiceHBase extends RangerBaseService {
}
public void init() {
- service = getService();
- serviceDef = getServiceDef();
- serviceName = service.getName();
- configs = service.getConfigs();
+ service = getService().getName();
+ configs = getService().getConfigs();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/d07c61ab/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/RangerServiceHdfs.java
----------------------------------------------------------------------
diff --git a/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/RangerServiceHdfs.java b/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/RangerServiceHdfs.java
index 65dcdf3..fcbf406 100644
--- a/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/RangerServiceHdfs.java
+++ b/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/RangerServiceHdfs.java
@@ -35,10 +35,8 @@ public class RangerServiceHdfs extends RangerBaseService {
private static final Log LOG = LogFactory.getLog(RangerServiceHdfs.class);
- RangerService service;
- RangerServiceDef serviceDef;
Map<String, String> configs;
- String serviceName;
+ String service;
public RangerServiceHdfs() {
super();
@@ -60,7 +58,7 @@ public class RangerServiceHdfs extends RangerBaseService {
if ( configs != null) {
try {
- ret = HdfsResourceMgr.testConnection(service.getName(), service.getConfigs());
+ ret = HdfsResourceMgr.testConnection(service, configs);
} catch (Exception e) {
LOG.error("<== RangerServiceHdfs.validateConfig Error:" + e);
throw e;
@@ -84,7 +82,7 @@ public class RangerServiceHdfs extends RangerBaseService {
if (context != null) {
try {
- ret = HdfsResourceMgr.getHdfsResources(service.getName(),service.getConfigs(),context);
+ ret = HdfsResourceMgr.getHdfsResources(service, configs,context);
} catch (Exception e) {
LOG.error( "<==RangerServiceHdfs.lookupResource Error : " + e);
throw e;
@@ -99,10 +97,8 @@ public class RangerServiceHdfs extends RangerBaseService {
}
public void init() {
- service = getService();
- serviceDef = getServiceDef();
- serviceName = service.getName();
- configs = service.getConfigs();
+ service = getService().getName();
+ configs = getService().getConfigs();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/d07c61ab/hive-agent/src/main/java/org/apache/ranger/services/hive/RangerServiceHive.java
----------------------------------------------------------------------
diff --git a/hive-agent/src/main/java/org/apache/ranger/services/hive/RangerServiceHive.java b/hive-agent/src/main/java/org/apache/ranger/services/hive/RangerServiceHive.java
index 4632b52..16c8dd4 100644
--- a/hive-agent/src/main/java/org/apache/ranger/services/hive/RangerServiceHive.java
+++ b/hive-agent/src/main/java/org/apache/ranger/services/hive/RangerServiceHive.java
@@ -35,10 +35,8 @@ public class RangerServiceHive extends RangerBaseService {
private static final Log LOG = LogFactory.getLog(RangerServiceHive.class);
- RangerService service;
- RangerServiceDef serviceDef;
Map<String, String> configs;
- String serviceName;
+ String service;
public RangerServiceHive() {
super();
@@ -54,11 +52,11 @@ public class RangerServiceHive extends RangerBaseService {
public HashMap<String,Object> validateConfig() throws Exception {
HashMap<String, Object> ret = new HashMap<String, Object>();
if(LOG.isDebugEnabled()) {
- LOG.debug("<== RangerServiceHive.validateConfig Service: (" + service + " )");
+ LOG.debug("==> RangerServiceHive.validateConfig Service: (" + service + " )");
}
if ( configs != null) {
try {
- ret = HiveResourceMgr.testConnection(service.getName(), service.getConfigs());
+ ret = HiveResourceMgr.testConnection(service, configs);
} catch (Exception e) {
LOG.error("<== RangerServiceHive.validateConfig Error:" + e);
throw e;
@@ -75,11 +73,11 @@ public class RangerServiceHive extends RangerBaseService {
List<String> ret = new ArrayList<String>();
if(LOG.isDebugEnabled()) {
- LOG.debug("<== RangerServiceHive.lookupResource Context: (" + context + ")");
+ LOG.debug("==> RangerServiceHive.lookupResource Context: (" + context + ")");
}
if (context != null) {
try {
- ret = HiveResourceMgr.getHiveResources(service.getName(),service.getConfigs(),context);
+ ret = HiveResourceMgr.getHiveResources(service, configs,context);
} catch (Exception e) {
LOG.error( "<==RangerServiceHive.lookupResource Error : " + e);
throw e;
@@ -92,10 +90,8 @@ public class RangerServiceHive extends RangerBaseService {
}
public void init() {
- service = getService();
- serviceDef = getServiceDef();
- serviceName = service.getName();
- configs = service.getConfigs();
+ service = getService().getName();
+ configs = getService().getConfigs();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/d07c61ab/knox-agent/src/main/java/org/apache/ranger/services/knox/RangerServiceKnox.java
----------------------------------------------------------------------
diff --git a/knox-agent/src/main/java/org/apache/ranger/services/knox/RangerServiceKnox.java b/knox-agent/src/main/java/org/apache/ranger/services/knox/RangerServiceKnox.java
index 4798b81..9cbaa5d 100644
--- a/knox-agent/src/main/java/org/apache/ranger/services/knox/RangerServiceKnox.java
+++ b/knox-agent/src/main/java/org/apache/ranger/services/knox/RangerServiceKnox.java
@@ -35,10 +35,8 @@ public class RangerServiceKnox extends RangerBaseService {
private static final Log LOG = LogFactory.getLog(RangerServiceKnox.class);
- RangerService service;
- RangerServiceDef serviceDef;
Map<String, String> configs;
- String serviceName;
+ String service;
public RangerServiceKnox() {
super();
@@ -58,7 +56,7 @@ public class RangerServiceKnox extends RangerBaseService {
}
if ( configs != null) {
try {
- ret = KnoxResourceMgr.validateConfig(service.getName(), service.getConfigs());
+ ret = KnoxResourceMgr.validateConfig(service, configs);
} catch (Exception e) {
LOG.error("<== RangerServiceKnox.validateConfig Error:" + e);
throw e;
@@ -79,7 +77,7 @@ public class RangerServiceKnox extends RangerBaseService {
}
if (context != null) {
try {
- ret = KnoxResourceMgr.getKnoxResources(service.getName(),service.getConfigs(),context);
+ ret = KnoxResourceMgr.getKnoxResources(service, configs,context);
} catch (Exception e) {
LOG.error( "<== RangerServiceKnox.lookupResource Error : " + e);
@@ -93,10 +91,8 @@ public class RangerServiceKnox extends RangerBaseService {
}
public void init() {
- service = getService();
- serviceDef = getServiceDef();
- serviceName = service.getName();
- configs = service.getConfigs();
+ service = getService().getName();
+ configs = getService().getConfigs();
}
}