ranger-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject ranger git commit: RANGER-1426 - Change return type of RangerBaseService.validateConfig
Date Wed, 08 Mar 2017 09:43:31 GMT
Repository: ranger
Updated Branches:
  refs/heads/master f35c8bd54 -> 20315eabb


RANGER-1426 - Change return type of RangerBaseService.validateConfig

Signed-off-by: Colm O hEigeartaigh <coheigea@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/20315eab
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/20315eab
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/20315eab

Branch: refs/heads/master
Commit: 20315eabbc93d824772981d3cec82f4a4e284b7e
Parents: f35c8bd
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Tue Mar 7 11:53:36 2017 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Wed Mar 8 09:36:50 2017 +0000

----------------------------------------------------------------------
 .../java/org/apache/ranger/plugin/client/BaseClient.java     | 3 +--
 .../org/apache/ranger/plugin/service/RangerBaseService.java  | 3 +--
 .../org/apache/ranger/services/tag/RangerServiceTag.java     | 4 ++--
 .../org/apache/ranger/services/hbase/RangerServiceHBase.java | 4 ++--
 .../org/apache/ranger/services/hbase/client/HBaseClient.java | 4 ++--
 .../ranger/services/hbase/client/HBaseResourceMgr.java       | 5 ++---
 .../org/apache/ranger/services/hdfs/RangerServiceHdfs.java   | 4 ++--
 .../org/apache/ranger/services/hdfs/client/HdfsClient.java   | 4 ++--
 .../apache/ranger/services/hdfs/client/HdfsResourceMgr.java  | 5 ++---
 .../org/apache/ranger/services/hive/RangerServiceHive.java   | 4 ++--
 .../org/apache/ranger/services/hive/client/HiveClient.java   | 4 ++--
 .../apache/ranger/services/hive/client/HiveResourceMgr.java  | 5 ++---
 .../org/apache/ranger/services/knox/RangerServiceKnox.java   | 4 ++--
 .../org/apache/ranger/services/knox/client/KnoxClient.java   | 4 ++--
 .../apache/ranger/services/knox/client/KnoxResourceMgr.java  | 5 ++---
 .../org/apache/ranger/services/atlas/RangerServiceAtlas.java | 4 ++--
 .../ranger/services/atlas/client/AtlasResourceMgr.java       | 5 ++---
 .../org/apache/ranger/services/kafka/RangerServiceKafka.java | 6 ++++--
 .../ranger/services/kafka/client/ServiceKafkaClient.java     | 4 ++--
 .../services/kafka/client/ServiceKafkaConnectionMgr.java     | 3 +--
 .../org/apache/ranger/services/kms/RangerServiceKMS.java     | 4 ++--
 .../org/apache/ranger/services/kms/client/KMSClient.java     | 4 ++--
 .../apache/ranger/services/kms/client/KMSResourceMgr.java    | 5 ++---
 .../org/apache/ranger/services/solr/RangerServiceSolr.java   | 6 ++++--
 .../ranger/services/solr/client/ServiceSolrClient.java       | 4 ++--
 .../services/solr/client/ServiceSolrConnectionMgr.java       | 3 +--
 .../org/apache/ranger/services/yarn/RangerServiceYarn.java   | 4 ++--
 .../org/apache/ranger/services/yarn/client/YarnClient.java   | 4 ++--
 .../apache/ranger/services/yarn/client/YarnResourceMgr.java  | 5 ++---
 .../src/main/java/org/apache/ranger/biz/ServiceMgr.java      | 8 ++++----
 .../org/apache/ranger/services/storm/RangerServiceStorm.java | 4 ++--
 .../org/apache/ranger/services/storm/client/StormClient.java | 4 ++--
 .../ranger/services/storm/client/StormResourceMgr.java       | 5 ++---
 33 files changed, 68 insertions(+), 76 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ranger/blob/20315eab/agents-common/src/main/java/org/apache/ranger/plugin/client/BaseClient.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/client/BaseClient.java b/agents-common/src/main/java/org/apache/ranger/plugin/client/BaseClient.java
index 2a570cb..941c118 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/client/BaseClient.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/client/BaseClient.java
@@ -21,7 +21,6 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -163,7 +162,7 @@ public abstract class BaseClient {
 	
 	public static void generateResponseDataMap(boolean connectivityStatus,
 			String message, String description, Long objectId,
-			String fieldName, HashMap<String, Object> responseData) {
+			String fieldName, Map<String, Object> responseData) {
 		responseData.put("connectivityStatus", connectivityStatus);
 		responseData.put("message", message);
 		responseData.put("description", description);

http://git-wip-us.apache.org/repos/asf/ranger/blob/20315eab/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 73027a0..debaa83 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
@@ -19,7 +19,6 @@
 
 package org.apache.ranger.plugin.service;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -82,7 +81,7 @@ public abstract class RangerBaseService {
 		this.serviceType = serviceType;
 	}
 		
-	public abstract HashMap<String, Object> validateConfig() throws Exception;
+	public abstract Map<String, Object> validateConfig() throws Exception;
 	
 	public abstract List<String> lookupResource(ResourceLookupContext context) throws
Exception;
 	

http://git-wip-us.apache.org/repos/asf/ranger/blob/20315eab/agents-common/src/main/java/org/apache/ranger/services/tag/RangerServiceTag.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/services/tag/RangerServiceTag.java
b/agents-common/src/main/java/org/apache/ranger/services/tag/RangerServiceTag.java
index 98413d9..bcf9064 100644
--- a/agents-common/src/main/java/org/apache/ranger/services/tag/RangerServiceTag.java
+++ b/agents-common/src/main/java/org/apache/ranger/services/tag/RangerServiceTag.java
@@ -55,12 +55,12 @@ public class RangerServiceTag extends RangerBaseService {
 	}
 
 	@Override
-	public HashMap<String,Object> validateConfig() throws Exception {
+	public Map<String,Object> validateConfig() throws Exception {
 		if(LOG.isDebugEnabled()) {
 			LOG.debug("==> RangerServiceTag.validateConfig(" + serviceName + " )");
 		}
 
-		HashMap<String, Object> ret = new HashMap<>();
+		Map<String, Object> ret = new HashMap<>();
 
 		ret.put("connectivityStatus", true);
 

http://git-wip-us.apache.org/repos/asf/ranger/blob/20315eab/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 7d5bf9b..01b97ea 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
@@ -46,8 +46,8 @@ public class RangerServiceHBase extends RangerBaseService {
 	}
 
 	@Override
-	public HashMap<String,Object> validateConfig() throws Exception {
-		HashMap<String, Object> ret = new HashMap<String, Object>();
+	public Map<String,Object> validateConfig() throws Exception {
+		Map<String, Object> ret = new HashMap<String, Object>();
 		
 		String serviceName = getServiceName();
 		

http://git-wip-us.apache.org/repos/asf/ranger/blob/20315eab/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 f0f086c..d9870e3 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
@@ -85,10 +85,10 @@ public class HBaseClient extends BaseClient {
 		return connectionProp;
 	}
 
-	public static HashMap<String, Object> connectionTest (String dataSource,
+	public static Map<String, Object> connectionTest (String dataSource,
 			Map<String, String> configs) throws Exception {
 
-		HashMap<String, Object> responseData = new HashMap<String, Object>();
+		Map<String, Object> responseData = new HashMap<String, Object>();
 		final String errMsg = " You can still save the repository and start creating "
 				+ "policies, but you would not be able to use autocomplete for "
 				+ "resource names. Check ranger_admin.log for more info.";

http://git-wip-us.apache.org/repos/asf/ranger/blob/20315eab/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 c033b00..5db6277 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
@@ -19,7 +19,6 @@
 
 package org.apache.ranger.services.hbase.client;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Callable;
@@ -38,8 +37,8 @@ public class HBaseResourceMgr {
 	private static final String TABLE 		 		    = "table";
 	private static final String COLUMNFAMILY 		    = "column-family";
 		
-	public static HashMap<String, Object> connectionTest(String serviceName, Map<String,
String> configs) throws Exception {
-		HashMap<String, Object> ret = null;
+	public static Map<String, Object> connectionTest(String serviceName, Map<String,
String> configs) throws Exception {
+		Map<String, Object> ret = null;
 		if(LOG.isDebugEnabled()) {
 			LOG.debug("<== HBaseResourceMgr.connectionTest() ServiceName: "+ serviceName + "Configs"
+ configs );
 		}	

http://git-wip-us.apache.org/repos/asf/ranger/blob/20315eab/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 e1648dc..bc12da9 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
@@ -46,8 +46,8 @@ public class RangerServiceHdfs extends RangerBaseService {
 	}
 
 	@Override
-	public HashMap<String,Object> validateConfig() throws Exception {
-		HashMap<String, Object> ret = new HashMap<String, Object>();
+	public Map<String,Object> validateConfig() throws Exception {
+		Map<String, Object> ret = new HashMap<String, Object>();
 		String 	serviceName  	    = getServiceName();
 		if(LOG.isDebugEnabled()) {
 			LOG.debug("<== RangerServiceHdfs.validateConfig Service: (" + serviceName + " )");

http://git-wip-us.apache.org/repos/asf/ranger/blob/20315eab/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 d712b08..4db0ec1 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
@@ -198,11 +198,11 @@ public class HdfsClient extends BaseClient {
 		}
 	}
 
-	public static HashMap<String, Object> connectionTest(String serviceName,
+	public static Map<String, Object> connectionTest(String serviceName,
 			Map<String, String> configs) throws Exception {
 
 	LOG.info("===> HdfsClient.testConnection()" );
-    HashMap<String, Object> responseData = new HashMap<String, Object>();
+    Map<String, Object> responseData = new HashMap<String, Object>();
     boolean connectivityStatus = false;
 
     String validateConfigsMsg = null;

http://git-wip-us.apache.org/repos/asf/ranger/blob/20315eab/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 bb6aa496..ffbab2a 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
@@ -20,7 +20,6 @@
 package org.apache.ranger.services.hdfs.client;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Callable;
@@ -36,8 +35,8 @@ public class HdfsResourceMgr {
 	private static final Logger LOG 	= Logger.getLogger(HdfsResourceMgr.class);
 	public static final String PATH	= "path";
 
-	public static HashMap<String, Object> connectionTest(String serviceName, Map<String,
String> configs) throws Exception {
-		HashMap<String, Object> ret = null;
+	public static Map<String, Object> connectionTest(String serviceName, Map<String,
String> configs) throws Exception {
+		Map<String, Object> ret = null;
 		
 		if(LOG.isDebugEnabled()) {
 			LOG.debug("<== HdfsResourceMgr.connectionTest ServiceName: "+ serviceName + "Configs"
+ configs );

http://git-wip-us.apache.org/repos/asf/ranger/blob/20315eab/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 9ce0347..a2bd5f7 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
@@ -46,8 +46,8 @@ public class RangerServiceHive extends RangerBaseService {
 	}
 
 	@Override
-	public HashMap<String,Object> validateConfig() throws Exception {
-		HashMap<String, Object> ret = new HashMap<String, Object>();
+	public Map<String,Object> validateConfig() throws Exception {
+		Map<String, Object> ret = new HashMap<String, Object>();
 		String 	serviceName  	    = getServiceName();
 		if(LOG.isDebugEnabled()) {
 			LOG.debug("==> RangerServiceHive.validateConfig Service: (" + serviceName + " )");

http://git-wip-us.apache.org/repos/asf/ranger/blob/20315eab/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 de36852..e3074ce 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
@@ -620,10 +620,10 @@ public class HiveClient extends BaseClient implements Closeable {
 		}	
 	}
 
-	public static HashMap<String, Object> connectionTest(String serviceName,
+	public static Map<String, Object> connectionTest(String serviceName,
 			Map<String, String> connectionProperties) throws Exception {
 		HiveClient connectionObj = null;
-		HashMap<String, Object> responseData = new HashMap<String, Object>();
+		Map<String, Object> responseData = new HashMap<String, Object>();
 		boolean connectivityStatus = false;
 		String errMsg = " You can still save the repository and start creating "
 				+ "policies, but you would not be able to use autocomplete for "

http://git-wip-us.apache.org/repos/asf/ranger/blob/20315eab/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 0a15f70..f1da958 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
@@ -18,7 +18,6 @@
  */
 package org.apache.ranger.services.hive.client;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Callable;
@@ -38,8 +37,8 @@ public class HiveResourceMgr {
 	private static final String  COLUMN	 	  = "column";
 
 	
-	public static HashMap<String, Object> connectionTest(String serviceName, Map<String,
String> configs) throws Exception {
-		HashMap<String, Object> ret = null;
+	public static Map<String, Object> connectionTest(String serviceName, Map<String,
String> configs) throws Exception {
+		Map<String, Object> ret = null;
 		
 		if(LOG.isDebugEnabled()) {
 			LOG.debug("==> HiveResourceMgr.connectionTest ServiceName: "+ serviceName + "Configs"
+ configs );

http://git-wip-us.apache.org/repos/asf/ranger/blob/20315eab/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 813b690..b72e776 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
@@ -45,8 +45,8 @@ public class RangerServiceKnox extends RangerBaseService {
 	}
 
 	@Override
-	public HashMap<String,Object> validateConfig() throws Exception {
-		HashMap<String, Object> ret = new HashMap<String, Object>();
+	public Map<String,Object> validateConfig() throws Exception {
+		Map<String, Object> ret = new HashMap<String, Object>();
 		String 	serviceName  	    = getServiceName();
 		if(LOG.isDebugEnabled()) {
 			LOG.debug("==> RangerServiceKnox.validateConfig Service: (" + serviceName + " )");

http://git-wip-us.apache.org/repos/asf/ranger/blob/20315eab/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 4c389e3..ec08ae8 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
@@ -302,14 +302,14 @@ public class KnoxClient {
 		}
 	}
 	
-	public static HashMap<String, Object> connectionTest(String serviceName,
+	public static Map<String, Object> connectionTest(String serviceName,
 										  		Map<String, String> configs) {
 
 		String errMsg = " You can still save the repository and start creating "
 				+ "policies, but you would not be able to use autocomplete for "
 				+ "resource names. Check ranger_admin.log for more info.";
 		boolean connectivityStatus = false;
-		HashMap<String, Object> responseData = new HashMap<String, Object>();
+		Map<String, Object> responseData = new HashMap<String, Object>();
 
 		KnoxClient knoxClient = getKnoxClient(serviceName, configs);
 		List<String> strList = getKnoxResources(knoxClient, "", null,null,null);

http://git-wip-us.apache.org/repos/asf/ranger/blob/20315eab/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 1d086fb..e887b11 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
@@ -19,7 +19,6 @@
 
 package org.apache.ranger.services.knox.client;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -34,8 +33,8 @@ public class KnoxResourceMgr {
 	private static final String TOPOLOGY	  	 = "topology";
 	private static final String SERVICE 	 	 = "service";
 
-	public static HashMap<String, Object> validateConfig(String serviceName, Map<String,
String> configs) throws Exception {
-		HashMap<String, Object> ret = null;
+	public static Map<String, Object> validateConfig(String serviceName, Map<String,
String> configs) throws Exception {
+		Map<String, Object> ret = null;
 		if (LOG.isDebugEnabled()) {
 		   LOG.debug("==> KnoxResourceMgr.testConnection ServiceName: "+ serviceName + "Configs"
+ configs );
 		}

http://git-wip-us.apache.org/repos/asf/ranger/blob/20315eab/plugin-atlas/src/main/java/org/apache/ranger/services/atlas/RangerServiceAtlas.java
----------------------------------------------------------------------
diff --git a/plugin-atlas/src/main/java/org/apache/ranger/services/atlas/RangerServiceAtlas.java
b/plugin-atlas/src/main/java/org/apache/ranger/services/atlas/RangerServiceAtlas.java
index 7e7dfe3..d2b60bd 100644
--- a/plugin-atlas/src/main/java/org/apache/ranger/services/atlas/RangerServiceAtlas.java
+++ b/plugin-atlas/src/main/java/org/apache/ranger/services/atlas/RangerServiceAtlas.java
@@ -44,8 +44,8 @@ public class RangerServiceAtlas extends RangerBaseService {
 	}
 
 	@Override
-	public HashMap<String, Object> validateConfig() throws Exception {
-		HashMap<String, Object> responseMap = new HashMap<String, Object>();
+	public Map<String, Object> validateConfig() throws Exception {
+		Map<String, Object> responseMap = new HashMap<String, Object>();
 		String serviceName = getServiceName();
 		if (LOG.isDebugEnabled()) {
 			LOG.debug("==> RangerServiceAtlas.validateConfig Service: ("+ serviceName + " )");

http://git-wip-us.apache.org/repos/asf/ranger/blob/20315eab/plugin-atlas/src/main/java/org/apache/ranger/services/atlas/client/AtlasResourceMgr.java
----------------------------------------------------------------------
diff --git a/plugin-atlas/src/main/java/org/apache/ranger/services/atlas/client/AtlasResourceMgr.java
b/plugin-atlas/src/main/java/org/apache/ranger/services/atlas/client/AtlasResourceMgr.java
index cb2ac9a..f81e304 100644
--- a/plugin-atlas/src/main/java/org/apache/ranger/services/atlas/client/AtlasResourceMgr.java
+++ b/plugin-atlas/src/main/java/org/apache/ranger/services/atlas/client/AtlasResourceMgr.java
@@ -19,7 +19,6 @@
 
 package org.apache.ranger.services.atlas.client;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -29,9 +28,9 @@ import org.apache.ranger.plugin.service.ResourceLookupContext;
 public class AtlasResourceMgr {
 	private static final Logger LOG = Logger.getLogger(AtlasResourceMgr.class);
 
-	public static HashMap<String, Object> validateConfig(String serviceName, Map<String,
String> configs) throws Exception {
+	public static Map<String, Object> validateConfig(String serviceName, Map<String,
String> configs) throws Exception {
 
-		HashMap<String, Object> ret = null;
+		Map<String, Object> ret = null;
 
 		if(LOG.isDebugEnabled()) {
 			LOG.debug("==> AtlasResourceMgr.validateConfig ServiceName: "+ serviceName + "Configs"
+ configs );

http://git-wip-us.apache.org/repos/asf/ranger/blob/20315eab/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 2f031fa..86e97bc 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
@@ -21,6 +21,8 @@ package org.apache.ranger.services.kafka;
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+
 import org.apache.ranger.plugin.model.RangerService;
 import org.apache.ranger.plugin.model.RangerServiceDef;
 import org.apache.ranger.plugin.service.RangerBaseService;
@@ -43,8 +45,8 @@ public class RangerServiceKafka extends RangerBaseService {
 	}
 
 	@Override
-	public HashMap<String, Object> validateConfig() throws Exception {
-		HashMap<String, Object> ret = new HashMap<String, Object>();
+	public Map<String, Object> validateConfig() throws Exception {
+		Map<String, Object> ret = new HashMap<String, Object>();
 
 		if (LOG.isDebugEnabled()) {
 			LOG.debug("==> RangerServiceKafka.validateConfig(" + serviceName + ")");

http://git-wip-us.apache.org/repos/asf/ranger/blob/20315eab/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 c908550..6929257 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
@@ -59,9 +59,9 @@ public class ServiceKafkaClient {
 		this.zookeeperConnect = zookeeperConnect;
 	}
 
-	public HashMap<String, Object> connectionTest() throws Exception {
+	public Map<String, Object> connectionTest() throws Exception {
 		String errMsg = errMessage;
-		HashMap<String, Object> responseData = new HashMap<String, Object>();
+		Map<String, Object> responseData = new HashMap<String, Object>();
 		try {
 			getTopicList(null);
 			// If it doesn't throw exception, then assume the instance is

http://git-wip-us.apache.org/repos/asf/ranger/blob/20315eab/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 0056c84..9e0d6b4 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
@@ -19,7 +19,6 @@
 
 package org.apache.ranger.services.kafka.client;
 
-import java.util.HashMap;
 import java.util.Map;
 
 public class ServiceKafkaConnectionMgr {
@@ -41,7 +40,7 @@ public class ServiceKafkaConnectionMgr {
 	 * @param configs
 	 * @return
 	 */
-	public static HashMap<String, Object> connectionTest(String serviceName,
+	public static Map<String, Object> connectionTest(String serviceName,
 			Map<String, String> configs) throws Exception {
 		ServiceKafkaClient serviceKafkaClient = getKafkaClient(serviceName,
 				configs);

http://git-wip-us.apache.org/repos/asf/ranger/blob/20315eab/plugin-kms/src/main/java/org/apache/ranger/services/kms/RangerServiceKMS.java
----------------------------------------------------------------------
diff --git a/plugin-kms/src/main/java/org/apache/ranger/services/kms/RangerServiceKMS.java
b/plugin-kms/src/main/java/org/apache/ranger/services/kms/RangerServiceKMS.java
index 8b41ae3..7657099 100644
--- a/plugin-kms/src/main/java/org/apache/ranger/services/kms/RangerServiceKMS.java
+++ b/plugin-kms/src/main/java/org/apache/ranger/services/kms/RangerServiceKMS.java
@@ -44,8 +44,8 @@ public class RangerServiceKMS extends RangerBaseService {
 	}
 
 	@Override
-	public HashMap<String,Object> validateConfig() throws Exception {
-		HashMap<String, Object> ret = new HashMap<String, Object>();
+	public Map<String,Object> validateConfig() throws Exception {
+		Map<String, Object> ret = new HashMap<String, Object>();
 		String 	serviceName  	    = getServiceName();
 		if(LOG.isDebugEnabled()) {
 			LOG.debug("==> RangerServiceKMS.validateConfig Service: (" + serviceName + " )");

http://git-wip-us.apache.org/repos/asf/ranger/blob/20315eab/plugin-kms/src/main/java/org/apache/ranger/services/kms/client/KMSClient.java
----------------------------------------------------------------------
diff --git a/plugin-kms/src/main/java/org/apache/ranger/services/kms/client/KMSClient.java
b/plugin-kms/src/main/java/org/apache/ranger/services/kms/client/KMSClient.java
index 016065d..af0ac71 100755
--- a/plugin-kms/src/main/java/org/apache/ranger/services/kms/client/KMSClient.java
+++ b/plugin-kms/src/main/java/org/apache/ranger/services/kms/client/KMSClient.java
@@ -305,13 +305,13 @@ public class KMSClient {
 		return lret;
 	}
 
-	public static HashMap<String, Object> testConnection(String serviceName,
+	public static Map<String, Object> testConnection(String serviceName,
 			Map<String, String> configs) {
 
 		List<String> strList = new ArrayList<String>();
 		String errMsg = errMessage;
 		boolean connectivityStatus = false;
-		HashMap<String, Object> responseData = new HashMap<String, Object>();
+		Map<String, Object> responseData = new HashMap<String, Object>();
 
 		KMSClient kmsClient = getKmsClient(serviceName, configs);
 		strList = getKmsKey(kmsClient, "", null);

http://git-wip-us.apache.org/repos/asf/ranger/blob/20315eab/plugin-kms/src/main/java/org/apache/ranger/services/kms/client/KMSResourceMgr.java
----------------------------------------------------------------------
diff --git a/plugin-kms/src/main/java/org/apache/ranger/services/kms/client/KMSResourceMgr.java
b/plugin-kms/src/main/java/org/apache/ranger/services/kms/client/KMSResourceMgr.java
index 09f2a6f..fe54723 100755
--- a/plugin-kms/src/main/java/org/apache/ranger/services/kms/client/KMSResourceMgr.java
+++ b/plugin-kms/src/main/java/org/apache/ranger/services/kms/client/KMSResourceMgr.java
@@ -19,7 +19,6 @@
 
 package org.apache.ranger.services.kms.client;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -30,8 +29,8 @@ public class KMSResourceMgr {
 	private static final 	Logger 	LOG 		= Logger.getLogger(KMSResourceMgr.class);
 	private static final 	String  KMSKEY	= "keyname";
 	
-	public static HashMap<String, Object> validateConfig(String serviceName, Map<String,
String> configs) throws Exception {
-		HashMap<String, Object> ret = null;
+	public static Map<String, Object> validateConfig(String serviceName, Map<String,
String> configs) throws Exception {
+		Map<String, Object> ret = null;
 		
 		if(LOG.isDebugEnabled()) {
 			LOG.debug("==> KMSResourceMgr.validateConfig ServiceName: "+ serviceName + "Configs"
+ configs );

http://git-wip-us.apache.org/repos/asf/ranger/blob/20315eab/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 8fa51ea..6477af7 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
@@ -21,6 +21,8 @@ package org.apache.ranger.services.solr;
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+
 import org.apache.ranger.plugin.model.RangerService;
 import org.apache.ranger.plugin.model.RangerServiceDef;
 import org.apache.ranger.plugin.service.RangerBaseService;
@@ -44,8 +46,8 @@ public class RangerServiceSolr extends RangerBaseService {
 	}
 
 	@Override
-	public HashMap<String, Object> validateConfig() throws Exception {
-		HashMap<String, Object> ret = new HashMap<String, Object>();
+	public Map<String, Object> validateConfig() throws Exception {
+		Map<String, Object> ret = new HashMap<String, Object>();
 		String serviceName = getServiceName();
 		if (LOG.isDebugEnabled()) {
 			LOG.debug("==> RangerServiceSolr.validateConfig Service: ("

http://git-wip-us.apache.org/repos/asf/ranger/blob/20315eab/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 74da115..bc5fdd0 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
@@ -71,9 +71,9 @@ public class ServiceSolrClient {
 
 	}
 
-	public HashMap<String, Object> connectionTest() throws Exception {
+	public Map<String, Object> connectionTest() throws Exception {
 		String errMsg = errMessage;
-		HashMap<String, Object> responseData = new HashMap<String, Object>();
+		Map<String, Object> responseData = new HashMap<String, Object>();
 
 		try {
 			getCollectionList(null);

http://git-wip-us.apache.org/repos/asf/ranger/blob/20315eab/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 81b664c..d8470a0 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
@@ -19,7 +19,6 @@
 
 package org.apache.ranger.services.solr.client;
 
-import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.solr.client.solrj.SolrClient;
@@ -49,7 +48,7 @@ public class ServiceSolrConnectionMgr {
 	 * @param configs
 	 * @return
 	 */
-	public static HashMap<String, Object> connectionTest(String serviceName,
+	public static Map<String, Object> connectionTest(String serviceName,
 			Map<String, String> configs) throws Exception {
 		ServiceSolrClient serviceSolrClient = getSolrClient(serviceName,
 				configs);

http://git-wip-us.apache.org/repos/asf/ranger/blob/20315eab/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/RangerServiceYarn.java
----------------------------------------------------------------------
diff --git a/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/RangerServiceYarn.java
b/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/RangerServiceYarn.java
index 7b11ded..69f2bc3 100644
--- a/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/RangerServiceYarn.java
+++ b/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/RangerServiceYarn.java
@@ -44,8 +44,8 @@ public class RangerServiceYarn extends RangerBaseService {
 	}
 
 	@Override
-	public HashMap<String,Object> validateConfig() throws Exception {
-		HashMap<String, Object> ret = new HashMap<String, Object>();
+	public Map<String,Object> validateConfig() throws Exception {
+		Map<String, Object> ret = new HashMap<String, Object>();
 		String 	serviceName  	    = getServiceName();
 		if(LOG.isDebugEnabled()) {
 			LOG.debug("==> RangerServiceYarn.validateConfig Service: (" + serviceName + " )");

http://git-wip-us.apache.org/repos/asf/ranger/blob/20315eab/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 7dbfa6d..b61a07e 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
@@ -249,12 +249,12 @@ public class YarnClient extends BaseClient {
 		return ret;
 	}
 
-	public static HashMap<String, Object> connectionTest(String serviceName,
+	public static Map<String, Object> connectionTest(String serviceName,
 			Map<String, String> configs) {
 
 		String errMsg = errMessage;
 		boolean connectivityStatus = false;
-		HashMap<String, Object> responseData = new HashMap<String, Object>();
+		Map<String, Object> responseData = new HashMap<String, Object>();
 
 		YarnClient yarnClient = getYarnClient(serviceName,
 				configs);

http://git-wip-us.apache.org/repos/asf/ranger/blob/20315eab/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 35b138f..991db07 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
@@ -19,7 +19,6 @@
 
 package org.apache.ranger.services.yarn.client;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -30,8 +29,8 @@ public class YarnResourceMgr {
 	private static final 	Logger 	LOG 		= Logger.getLogger(YarnResourceMgr.class);
 	private static final 	String  YARNQUEUE	= "queue";
 	
-	public static HashMap<String, Object> validateConfig(String serviceName, Map<String,
String> configs) throws Exception {
-		HashMap<String, Object> ret = null;
+	public static Map<String, Object> validateConfig(String serviceName, Map<String,
String> configs) throws Exception {
+		Map<String, Object> ret = null;
 		
 		if(LOG.isDebugEnabled()) {
 			LOG.debug("==> YarnResourceMgr.validateConfig ServiceName: "+ serviceName + "Configs"
+ configs );

http://git-wip-us.apache.org/repos/asf/ranger/blob/20315eab/security-admin/src/main/java/org/apache/ranger/biz/ServiceMgr.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/ServiceMgr.java b/security-admin/src/main/java/org/apache/ranger/biz/ServiceMgr.java
index f512049..f2b8f99 100644
--- a/security-admin/src/main/java/org/apache/ranger/biz/ServiceMgr.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/ServiceMgr.java
@@ -174,7 +174,7 @@ public class ServiceMgr {
 				// Timeout value use during validate config is 10 times that used during lookup
 				long time = getTimeoutValueForValidateConfigInMilliSeconds(svc);
 				ValidateCallable callable = new ValidateCallable(svc);
-				HashMap<String, Object> responseData = timedExecutor.timedTask(callable, time,
TimeUnit.MILLISECONDS);
+				Map<String, Object> responseData = timedExecutor.timedTask(callable, time, TimeUnit.MILLISECONDS);
 
 				ret = generateResponseForTestConn(responseData, "");
 			} catch (Exception e) {
@@ -373,7 +373,7 @@ public class ServiceMgr {
 	}
 
 	private VXResponse generateResponseForTestConn(
-			HashMap<String, Object> responseData, String msg) {
+			Map<String, Object> responseData, String msg) {
 		VXResponse vXResponse = new VXResponse();
 
 		Long objId = null;
@@ -544,7 +544,7 @@ public class ServiceMgr {
 		}
 	}
 
-	static class ValidateCallable extends TimedCallable<HashMap<String, Object>>
{
+	static class ValidateCallable extends TimedCallable<Map<String, Object>> {
 
 		public ValidateCallable(RangerBaseService svc) {
 			super(svc);
@@ -556,7 +556,7 @@ public class ServiceMgr {
 		}
 
 		@Override
-		public HashMap<String, Object> actualCall() throws Exception {
+		public Map<String, Object> actualCall() throws Exception {
 			return svc.validateConfig();
 		}
 	}

http://git-wip-us.apache.org/repos/asf/ranger/blob/20315eab/storm-agent/src/main/java/org/apache/ranger/services/storm/RangerServiceStorm.java
----------------------------------------------------------------------
diff --git a/storm-agent/src/main/java/org/apache/ranger/services/storm/RangerServiceStorm.java
b/storm-agent/src/main/java/org/apache/ranger/services/storm/RangerServiceStorm.java
index dccd311..d4dbd7b 100644
--- a/storm-agent/src/main/java/org/apache/ranger/services/storm/RangerServiceStorm.java
+++ b/storm-agent/src/main/java/org/apache/ranger/services/storm/RangerServiceStorm.java
@@ -45,8 +45,8 @@ public class RangerServiceStorm extends RangerBaseService {
 	}
 
 	@Override
-	public HashMap<String,Object> validateConfig() throws Exception {
-		HashMap<String, Object> ret = new HashMap<String, Object>();
+	public Map<String,Object> validateConfig() throws Exception {
+		Map<String, Object> ret = new HashMap<String, Object>();
 		String 	serviceName  	    = getServiceName();
 		if(LOG.isDebugEnabled()) {
 			LOG.debug("==> RangerServiceStorm.validateConfig Service: (" + serviceName + " )");

http://git-wip-us.apache.org/repos/asf/ranger/blob/20315eab/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 cb56609..b72a9a2 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
@@ -348,12 +348,12 @@ public class StormClient {
 		return ret;
 	}
 
-	public static HashMap<String, Object> connectionTest(String serviceName,
+	public static Map<String, Object> connectionTest(String serviceName,
 			Map<String, String> configs) {
 
 		String errMsg = errMessage;
 		boolean connectivityStatus = false;
-		HashMap<String, Object> responseData = new HashMap<String, Object>();
+		Map<String, Object> responseData = new HashMap<String, Object>();
 
 		StormClient stormClient = getStormClient(serviceName,
 				configs);

http://git-wip-us.apache.org/repos/asf/ranger/blob/20315eab/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 43960b3..0dd5507 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
@@ -20,7 +20,6 @@
 package org.apache.ranger.services.storm.client;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -31,8 +30,8 @@ public class StormResourceMgr {
 	private static final 	Logger 	LOG 		= Logger.getLogger(StormResourceMgr.class);
 	private static final 	String  TOPOLOGY	= "topology";
 	
-	public static HashMap<String, Object> validateConfig(String serviceName, Map<String,
String> configs) throws Exception {
-		HashMap<String, Object> ret = null;
+	public static Map<String, Object> validateConfig(String serviceName, Map<String,
String> configs) throws Exception {
+		Map<String, Object> ret = null;
 		
 		if(LOG.isDebugEnabled()) {
 			LOG.debug("==> StormResourceMgr.validateConfig ServiceName: "+ serviceName + "Configs"
+ configs );


Mime
View raw message