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 2016/03/08 19:03:56 UTC
incubator-ranger git commit: RANGER-879 - Fix
JUnit4TestShouldUseTestAnnotation issue
Repository: incubator-ranger
Updated Branches:
refs/heads/master 3620842ae -> 8f1ac35a0
RANGER-879 - Fix JUnit4TestShouldUseTestAnnotation issue
Signed-off-by: Madhan Neethiraj <ma...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/8f1ac35a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/8f1ac35a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/8f1ac35a
Branch: refs/heads/master
Commit: 8f1ac35a01a61213beab09f471501f01177ff275
Parents: 3620842
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue Mar 8 12:58:13 2016 +0000
Committer: Madhan Neethiraj <ma...@apache.org>
Committed: Tue Mar 8 09:54:48 2016 -0800
----------------------------------------------------------------------
dev-support/ranger-pmd-ruleset.xml | 4 +---
.../apache/ranger/services/hbase/RangerServiceHBase.java | 2 +-
.../apache/ranger/services/hbase/client/HBaseClient.java | 4 ++--
.../ranger/services/hbase/client/HBaseResourceMgr.java | 10 +++++-----
.../apache/ranger/services/hdfs/RangerServiceHdfs.java | 2 +-
.../apache/ranger/services/hdfs/client/HdfsClient.java | 4 ++--
.../ranger/services/hdfs/client/HdfsResourceMgr.java | 10 +++++-----
.../apache/ranger/services/hive/RangerServiceHive.java | 2 +-
.../apache/ranger/services/hive/client/HiveClient.java | 4 ++--
.../ranger/services/hive/client/HiveResourceMgr.java | 10 +++++-----
.../apache/ranger/services/knox/client/KnoxClient.java | 4 ++--
.../ranger/services/knox/client/KnoxResourceMgr.java | 4 ++--
.../apache/ranger/services/kafka/RangerServiceKafka.java | 2 +-
.../ranger/services/kafka/client/ServiceKafkaClient.java | 4 ++--
.../services/kafka/client/ServiceKafkaConnectionMgr.java | 4 ++--
.../apache/ranger/services/solr/RangerServiceSolr.java | 2 +-
.../ranger/services/solr/client/ServiceSolrClient.java | 4 ++--
.../services/solr/client/ServiceSolrConnectionMgr.java | 4 ++--
.../apache/ranger/services/yarn/client/YarnClient.java | 4 ++--
.../ranger/services/yarn/client/YarnResourceMgr.java | 2 +-
.../src/main/java/org/apache/ranger/rest/AssetREST.java | 4 ++--
.../apache/ranger/services/storm/client/StormClient.java | 4 ++--
.../ranger/services/storm/client/StormResourceMgr.java | 2 +-
23 files changed, 47 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/8f1ac35a/dev-support/ranger-pmd-ruleset.xml
----------------------------------------------------------------------
diff --git a/dev-support/ranger-pmd-ruleset.xml b/dev-support/ranger-pmd-ruleset.xml
index daf2162..741601e 100644
--- a/dev-support/ranger-pmd-ruleset.xml
+++ b/dev-support/ranger-pmd-ruleset.xml
@@ -57,9 +57,7 @@
<exclude name="EmptyStatementNotInLoop" />
<exclude name="EmptyWhileStmt" />
</rule>
- <rule ref="rulesets/java/migrating.xml">
- <exclude name="JUnit4TestShouldUseTestAnnotation" />
- </rule>
+ <rule ref="rulesets/java/migrating.xml" />
<rule ref="rulesets/java/unnecessary.xml">
<exclude name="UnnecessaryConversionTemporary" />
<exclude name="UnnecessaryReturn" />
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/8f1ac35a/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 ae79ca8..9832991 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
@@ -55,7 +55,7 @@ public class RangerServiceHBase extends RangerBaseService {
}
if ( configs != null) {
try {
- ret = HBaseResourceMgr.testConnection(serviceName, configs);
+ ret = HBaseResourceMgr.connectionTest(serviceName, configs);
} catch (Exception e) {
LOG.error("<== RangerServiceHBase.validateConfig() Error:" + e);
throw e;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/8f1ac35a/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseClient.java
----------------------------------------------------------------------
diff --git a/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseClient.java b/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseClient.java
index e9bc684..f28a598 100644
--- a/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseClient.java
+++ b/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseClient.java
@@ -90,7 +90,7 @@ public class HBaseClient extends BaseClient {
return connectionProp;
}
- public static HashMap<String, Object> testConnection(String dataSource,
+ public static HashMap<String, Object> connectionTest(String dataSource,
Map<String, String> configs) {
HashMap<String, Object> responseData = new HashMap<String, Object>();
@@ -106,7 +106,7 @@ public class HBaseClient extends BaseClient {
}
if (connectivityStatus) {
- String successMsg = "TestConnection Successful";
+ String successMsg = "ConnectionTest Successful";
generateResponseDataMap(connectivityStatus, successMsg, successMsg,
null, null, responseData);
} else {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/8f1ac35a/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseResourceMgr.java
----------------------------------------------------------------------
diff --git a/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseResourceMgr.java b/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseResourceMgr.java
index 1e4f6d0..094385c 100644
--- a/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseResourceMgr.java
+++ b/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseResourceMgr.java
@@ -37,20 +37,20 @@ public class HBaseResourceMgr {
private static final String TABLE = "table";
private static final String COLUMNFAMILY = "column-family";
- public static HashMap<String, Object> testConnection(String serviceName, Map<String, String> configs) throws Exception {
+ public static HashMap<String, Object> connectionTest(String serviceName, Map<String, String> configs) throws Exception {
HashMap<String, Object> ret = null;
if(LOG.isDebugEnabled()) {
- LOG.debug("<== HBaseResourceMgr.testConnection() ServiceName: "+ serviceName + "Configs" + configs ) ;
+ LOG.debug("<== HBaseResourceMgr.connectionTest() ServiceName: "+ serviceName + "Configs" + configs ) ;
}
try {
- ret = HBaseClient.testConnection(serviceName, configs);
+ ret = HBaseClient.connectionTest(serviceName, configs);
} catch (Exception e) {
- LOG.error("<== HBaseResourceMgr.testConnection() Error: " + e) ;
+ LOG.error("<== HBaseResourceMgr.connectionTest() Error: " + e) ;
throw e;
}
if(LOG.isDebugEnabled()) {
- LOG.debug("<== HBaseResourceMgr.testConnection() Result: "+ ret ) ;
+ LOG.debug("<== HBaseResourceMgr.connectionTest() Result: "+ ret ) ;
}
return ret;
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/8f1ac35a/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 fd46b1e..5f07740 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
@@ -54,7 +54,7 @@ public class RangerServiceHdfs extends RangerBaseService {
if ( configs != null) {
try {
- ret = HdfsResourceMgr.testConnection(serviceName, configs);
+ ret = HdfsResourceMgr.connectionTest(serviceName, configs);
} catch (Exception e) {
LOG.error("<== RangerServiceHdfs.validateConfig Error:" + e);
throw e;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/8f1ac35a/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsClient.java
----------------------------------------------------------------------
diff --git a/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsClient.java b/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsClient.java
index 7bfb016..57b260d 100644
--- a/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsClient.java
+++ b/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsClient.java
@@ -190,7 +190,7 @@ public class HdfsClient extends BaseClient {
}
}
- public static HashMap<String, Object> testConnection(String serviceName,
+ public static HashMap<String, Object> connectionTest(String serviceName,
Map<String, String> configs) {
HashMap<String, Object> responseData = new HashMap<String, Object>();
@@ -214,7 +214,7 @@ public class HdfsClient extends BaseClient {
}
if (connectivityStatus) {
- String successMsg = "TestConnection Successful";
+ String successMsg = "ConnectionTest Successful";
generateResponseDataMap(connectivityStatus, successMsg, successMsg,
null, null, responseData);
} else {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/8f1ac35a/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsResourceMgr.java
----------------------------------------------------------------------
diff --git a/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsResourceMgr.java b/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsResourceMgr.java
index 73ce00d..5bce2cd 100644
--- a/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsResourceMgr.java
+++ b/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsResourceMgr.java
@@ -35,22 +35,22 @@ public class HdfsResourceMgr {
public static final Logger LOG = Logger.getLogger(HdfsResourceMgr.class);
public static final String PATH = "path";
- public static HashMap<String, Object> testConnection(String serviceName, Map<String, String> configs) throws Exception {
+ public static HashMap<String, Object> connectionTest(String serviceName, Map<String, String> configs) throws Exception {
HashMap<String, Object> ret = null;
if(LOG.isDebugEnabled()) {
- LOG.debug("<== HdfsResourceMgr.testConnection ServiceName: "+ serviceName + "Configs" + configs ) ;
+ LOG.debug("<== HdfsResourceMgr.connectionTest ServiceName: "+ serviceName + "Configs" + configs ) ;
}
try {
- ret = HdfsClient.testConnection(serviceName, configs);
+ ret = HdfsClient.connectionTest(serviceName, configs);
} catch (Exception e) {
- LOG.error("<== HdfsResourceMgr.testConnection Error: " + e) ;
+ LOG.error("<== HdfsResourceMgr.connectionTest Error: " + e) ;
throw e;
}
if(LOG.isDebugEnabled()) {
- LOG.debug("<== HdfsResourceMgr.testConnection Result : "+ ret ) ;
+ LOG.debug("<== HdfsResourceMgr.connectionTest Result : "+ ret ) ;
}
return ret;
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/8f1ac35a/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 44e13f3..fa006ef 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
@@ -53,7 +53,7 @@ public class RangerServiceHive extends RangerBaseService {
}
if ( configs != null) {
try {
- ret = HiveResourceMgr.testConnection(serviceName, configs);
+ ret = HiveResourceMgr.connectionTest(serviceName, configs);
} catch (Exception e) {
LOG.error("<== RangerServiceHive.validateConfig Error:" + e);
throw e;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/8f1ac35a/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveClient.java
----------------------------------------------------------------------
diff --git a/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveClient.java b/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveClient.java
index 3668eac..84f4d9b 100644
--- a/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveClient.java
+++ b/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveClient.java
@@ -542,7 +542,7 @@ public class HiveClient extends BaseClient implements Closeable {
}
}
- public static HashMap<String, Object> testConnection(String serviceName,
+ public static HashMap<String, Object> connectionTest(String serviceName,
Map<String, String> connectionProperties) {
HashMap<String, Object> responseData = new HashMap<String, Object>();
@@ -561,7 +561,7 @@ public class HiveClient extends BaseClient implements Closeable {
}
}
if (connectivityStatus) {
- String successMsg = "TestConnection Successful";
+ String successMsg = "ConnectionTest Successful";
generateResponseDataMap(connectivityStatus, successMsg, successMsg,
null, null, responseData);
} else {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/8f1ac35a/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveResourceMgr.java
----------------------------------------------------------------------
diff --git a/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveResourceMgr.java b/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveResourceMgr.java
index 98622b0..b51a0c1 100644
--- a/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveResourceMgr.java
+++ b/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveResourceMgr.java
@@ -38,22 +38,22 @@ public class HiveResourceMgr {
private static final String COLUMN = "column";
- public static HashMap<String, Object> testConnection(String serviceName, Map<String, String> configs) throws Exception {
+ public static HashMap<String, Object> connectionTest(String serviceName, Map<String, String> configs) throws Exception {
HashMap<String, Object> ret = null;
if(LOG.isDebugEnabled()) {
- LOG.debug("==> HiveResourceMgr.testConnection ServiceName: "+ serviceName + "Configs" + configs ) ;
+ LOG.debug("==> HiveResourceMgr.connectionTest ServiceName: "+ serviceName + "Configs" + configs ) ;
}
try {
- ret = HiveClient.testConnection(serviceName, configs);
+ ret = HiveClient.connectionTest(serviceName, configs);
} catch (Exception e) {
- LOG.error("<== HiveResourceMgr.testConnection Error: " + e) ;
+ LOG.error("<== HiveResourceMgr.connectionTest Error: " + e) ;
throw e;
}
if(LOG.isDebugEnabled()) {
- LOG.debug("<== HiveResourceMgr.testConnection Result : "+ ret ) ;
+ LOG.debug("<== HiveResourceMgr.connectionTest Result : "+ ret ) ;
}
return ret;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/8f1ac35a/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxClient.java
----------------------------------------------------------------------
diff --git a/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxClient.java b/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxClient.java
index 2b6c92c..094226d 100644
--- a/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxClient.java
+++ b/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxClient.java
@@ -275,7 +275,7 @@ public class KnoxClient {
}
}
- public static HashMap<String, Object> testConnection(String serviceName,
+ public static HashMap<String, Object> connectionTest(String serviceName,
Map<String, String> configs) {
List<String> strList = new ArrayList<String>();
@@ -293,7 +293,7 @@ public class KnoxClient {
}
if (connectivityStatus) {
- String successMsg = "TestConnection Successful";
+ String successMsg = "ConnectionTest Successful";
BaseClient.generateResponseDataMap(connectivityStatus, successMsg, successMsg,
null, null, responseData);
} else {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/8f1ac35a/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxResourceMgr.java
----------------------------------------------------------------------
diff --git a/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxResourceMgr.java b/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxResourceMgr.java
index 34a3c40..c1a7d7f 100644
--- a/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxResourceMgr.java
+++ b/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxResourceMgr.java
@@ -40,9 +40,9 @@ public class KnoxResourceMgr {
LOG.debug("==> KnoxResourceMgr.testConnection ServiceName: "+ serviceName + "Configs" + configs ) ;
}
try {
- ret = KnoxClient.testConnection(serviceName, configs);
+ ret = KnoxClient.connectionTest(serviceName, configs);
} catch (Exception e) {
- LOG.error("<== KnoxResourceMgr.testConnection Error: " + e) ;
+ LOG.error("<== KnoxResourceMgr.connectionTest Error: " + e) ;
throw e;
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/8f1ac35a/plugin-kafka/src/main/java/org/apache/ranger/services/kafka/RangerServiceKafka.java
----------------------------------------------------------------------
diff --git a/plugin-kafka/src/main/java/org/apache/ranger/services/kafka/RangerServiceKafka.java b/plugin-kafka/src/main/java/org/apache/ranger/services/kafka/RangerServiceKafka.java
index 8a82b2f..f7fe3ed 100644
--- a/plugin-kafka/src/main/java/org/apache/ranger/services/kafka/RangerServiceKafka.java
+++ b/plugin-kafka/src/main/java/org/apache/ranger/services/kafka/RangerServiceKafka.java
@@ -52,7 +52,7 @@ public class RangerServiceKafka extends RangerBaseService {
if (configs != null) {
try {
- ret = ServiceKafkaConnectionMgr.testConnection(serviceName, configs);
+ ret = ServiceKafkaConnectionMgr.connectionTest(serviceName, configs);
} catch (Exception e) {
LOG.error("<== RangerServiceKafka.validateConfig Error:" + e);
throw e;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/8f1ac35a/plugin-kafka/src/main/java/org/apache/ranger/services/kafka/client/ServiceKafkaClient.java
----------------------------------------------------------------------
diff --git a/plugin-kafka/src/main/java/org/apache/ranger/services/kafka/client/ServiceKafkaClient.java b/plugin-kafka/src/main/java/org/apache/ranger/services/kafka/client/ServiceKafkaClient.java
index f5c04fe..cd866b9 100644
--- a/plugin-kafka/src/main/java/org/apache/ranger/services/kafka/client/ServiceKafkaClient.java
+++ b/plugin-kafka/src/main/java/org/apache/ranger/services/kafka/client/ServiceKafkaClient.java
@@ -60,14 +60,14 @@ public class ServiceKafkaClient {
this.zookeeperConnect = zookeeperConnect;
}
- public HashMap<String, Object> testConnection() throws Exception {
+ public HashMap<String, Object> connectionTest() throws Exception {
String errMsg = errMessage;
HashMap<String, Object> responseData = new HashMap<String, Object>();
try {
getTopicList(null);
// If it doesn't throw exception, then assume the instance is
// reachable
- String successMsg = "TestConnection Successful";
+ String successMsg = "ConnectionTest Successful";
BaseClient.generateResponseDataMap(true, successMsg,
successMsg, null, null, responseData);
} catch (IOException e) {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/8f1ac35a/plugin-kafka/src/main/java/org/apache/ranger/services/kafka/client/ServiceKafkaConnectionMgr.java
----------------------------------------------------------------------
diff --git a/plugin-kafka/src/main/java/org/apache/ranger/services/kafka/client/ServiceKafkaConnectionMgr.java b/plugin-kafka/src/main/java/org/apache/ranger/services/kafka/client/ServiceKafkaConnectionMgr.java
index a6d9d55..62bee8f 100644
--- a/plugin-kafka/src/main/java/org/apache/ranger/services/kafka/client/ServiceKafkaConnectionMgr.java
+++ b/plugin-kafka/src/main/java/org/apache/ranger/services/kafka/client/ServiceKafkaConnectionMgr.java
@@ -45,11 +45,11 @@ public class ServiceKafkaConnectionMgr {
* @param configs
* @return
*/
- public static HashMap<String, Object> testConnection(String serviceName,
+ public static HashMap<String, Object> connectionTest(String serviceName,
Map<String, String> configs) throws Exception {
ServiceKafkaClient serviceKafkaClient = getKafkaClient(serviceName,
configs);
- return serviceKafkaClient.testConnection();
+ return serviceKafkaClient.connectionTest();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/8f1ac35a/plugin-solr/src/main/java/org/apache/ranger/services/solr/RangerServiceSolr.java
----------------------------------------------------------------------
diff --git a/plugin-solr/src/main/java/org/apache/ranger/services/solr/RangerServiceSolr.java b/plugin-solr/src/main/java/org/apache/ranger/services/solr/RangerServiceSolr.java
index 1474b29..5262494 100644
--- a/plugin-solr/src/main/java/org/apache/ranger/services/solr/RangerServiceSolr.java
+++ b/plugin-solr/src/main/java/org/apache/ranger/services/solr/RangerServiceSolr.java
@@ -53,7 +53,7 @@ public class RangerServiceSolr extends RangerBaseService {
}
if (configs != null) {
try {
- ret = ServiceSolrConnectionMgr.testConnection(serviceName,
+ ret = ServiceSolrConnectionMgr.connectionTest(serviceName,
configs);
} catch (Exception e) {
LOG.error("<== RangerServiceSolr.validateConfig Error:", e);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/8f1ac35a/plugin-solr/src/main/java/org/apache/ranger/services/solr/client/ServiceSolrClient.java
----------------------------------------------------------------------
diff --git a/plugin-solr/src/main/java/org/apache/ranger/services/solr/client/ServiceSolrClient.java b/plugin-solr/src/main/java/org/apache/ranger/services/solr/client/ServiceSolrClient.java
index 801578b..fc82dfd 100644
--- a/plugin-solr/src/main/java/org/apache/ranger/services/solr/client/ServiceSolrClient.java
+++ b/plugin-solr/src/main/java/org/apache/ranger/services/solr/client/ServiceSolrClient.java
@@ -70,7 +70,7 @@ public class ServiceSolrClient {
}
- public HashMap<String, Object> testConnection() throws Exception {
+ public HashMap<String, Object> connectionTest() throws Exception {
String errMsg = errMessage;
HashMap<String, Object> responseData = new HashMap<String, Object>();
@@ -78,7 +78,7 @@ public class ServiceSolrClient {
getCollectionList(null);
// If it doesn't throw exception, then assume the instance is
// reachable
- String successMsg = "TestConnection Successful";
+ String successMsg = "ConnectionTest Successful";
BaseClient.generateResponseDataMap(true, successMsg,
successMsg, null, null, responseData);
} catch (IOException e) {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/8f1ac35a/plugin-solr/src/main/java/org/apache/ranger/services/solr/client/ServiceSolrConnectionMgr.java
----------------------------------------------------------------------
diff --git a/plugin-solr/src/main/java/org/apache/ranger/services/solr/client/ServiceSolrConnectionMgr.java b/plugin-solr/src/main/java/org/apache/ranger/services/solr/client/ServiceSolrConnectionMgr.java
index 7eeb5cd..680ff3e 100644
--- a/plugin-solr/src/main/java/org/apache/ranger/services/solr/client/ServiceSolrConnectionMgr.java
+++ b/plugin-solr/src/main/java/org/apache/ranger/services/solr/client/ServiceSolrConnectionMgr.java
@@ -52,11 +52,11 @@ public class ServiceSolrConnectionMgr {
* @param configs
* @return
*/
- public static HashMap<String, Object> testConnection(String serviceName,
+ public static HashMap<String, Object> connectionTest(String serviceName,
Map<String, String> configs) throws Exception {
ServiceSolrClient serviceSolrClient = getSolrClient(serviceName,
configs);
- return serviceSolrClient.testConnection();
+ return serviceSolrClient.connectionTest();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/8f1ac35a/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/YarnClient.java
----------------------------------------------------------------------
diff --git a/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/YarnClient.java b/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/YarnClient.java
index c29cf45..0a06190 100644
--- a/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/YarnClient.java
+++ b/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/YarnClient.java
@@ -223,7 +223,7 @@ public class YarnClient extends BaseClient {
- public static HashMap<String, Object> testConnection(String serviceName,
+ public static HashMap<String, Object> connectionTest(String serviceName,
Map<String, String> configs) {
List<String> strList = new ArrayList<String>();
@@ -243,7 +243,7 @@ public class YarnClient extends BaseClient {
}
if (connectivityStatus) {
- String successMsg = "TestConnection Successful";
+ String successMsg = "ConnectionTest Successful";
BaseClient.generateResponseDataMap(connectivityStatus, successMsg,
successMsg, null, null, responseData);
} else {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/8f1ac35a/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/YarnResourceMgr.java
----------------------------------------------------------------------
diff --git a/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/YarnResourceMgr.java b/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/YarnResourceMgr.java
index 97fdf19..f8ec8c6 100644
--- a/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/YarnResourceMgr.java
+++ b/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/YarnResourceMgr.java
@@ -38,7 +38,7 @@ public class YarnResourceMgr {
}
try {
- ret = YarnClient.testConnection(serviceName, configs);
+ ret = YarnClient.connectionTest(serviceName, configs);
} catch (Exception e) {
LOG.error("<== YarnResourceMgr.validateConfig Error: " + e) ;
throw e;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/8f1ac35a/security-admin/src/main/java/org/apache/ranger/rest/AssetREST.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/rest/AssetREST.java b/security-admin/src/main/java/org/apache/ranger/rest/AssetREST.java
index 38d15cd..827a69a 100644
--- a/security-admin/src/main/java/org/apache/ranger/rest/AssetREST.java
+++ b/security-admin/src/main/java/org/apache/ranger/rest/AssetREST.java
@@ -225,9 +225,9 @@ public class AssetREST {
@Path("/assets/testConfig")
@Produces({ "application/xml", "application/json" })
@PreAuthorize("@rangerPreAuthSecurityHandler.isAPIAccessible(\"" + RangerAPIList.TEST_CONFIG + "\")")
- public VXResponse testConfig(VXAsset vXAsset) {
+ public VXResponse configTest(VXAsset vXAsset) {
if(logger.isDebugEnabled()) {
- logger.debug("==> AssetREST.testConfig(" + vXAsset + ")");
+ logger.debug("==> AssetREST.configTest(" + vXAsset + ")");
}
RangerService service = serviceUtil.toRangerService(vXAsset);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/8f1ac35a/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormClient.java
----------------------------------------------------------------------
diff --git a/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormClient.java b/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormClient.java
index c7c746d..84c2ebf 100644
--- a/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormClient.java
+++ b/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormClient.java
@@ -297,7 +297,7 @@ public class StormClient {
return ret;
}
- public static HashMap<String, Object> testConnection(String serviceName,
+ public static HashMap<String, Object> connectionTest(String serviceName,
Map<String, String> configs) {
List<String> strList = new ArrayList<String>();
@@ -314,7 +314,7 @@ public class StormClient {
}
if (connectivityStatus) {
- String successMsg = "TestConnection Successful";
+ String successMsg = "ConnectionTest Successful";
BaseClient.generateResponseDataMap(connectivityStatus, successMsg,
successMsg, null, null, responseData);
} else {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/8f1ac35a/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormResourceMgr.java
----------------------------------------------------------------------
diff --git a/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormResourceMgr.java b/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormResourceMgr.java
index 52c7401..a16fce1 100644
--- a/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormResourceMgr.java
+++ b/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormResourceMgr.java
@@ -39,7 +39,7 @@ public class StormResourceMgr {
}
try {
- ret = StormClient.testConnection(serviceName, configs);
+ ret = StormClient.connectionTest(serviceName, configs);
} catch (Exception e) {
LOG.error("<== StormResourceMgr.validateConfig Error: " + e) ;
throw e;