You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by co...@apache.org on 2017/08/09 11:22:50 UTC
ranger git commit: Refactoring duplicate code for exception wrapping
in BaseClient
Repository: ranger
Updated Branches:
refs/heads/master f01bcf3d0 -> 688807cf7
Refactoring duplicate code for exception wrapping in BaseClient
Signed-off-by: Colm O hEigeartaigh <co...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/688807cf
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/688807cf
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/688807cf
Branch: refs/heads/master
Commit: 688807cf74fc434e246a2f7d6c0e71e941178421
Parents: f01bcf3
Author: Zsombor Gegesy <gz...@gmail.com>
Authored: Fri Jul 28 16:03:51 2017 +0200
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Aug 9 11:49:47 2017 +0100
----------------------------------------------------------------------
.../apache/ranger/plugin/client/BaseClient.java | 48 +++++++++-----------
1 file changed, 21 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ranger/blob/688807cf/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 e1f9796..cb170c2 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
@@ -37,6 +37,9 @@ public abstract class BaseClient {
private static final String DEFAULT_NAME_RULE = "DEFAULT";
+ private static final String DEFAULT_ERROR_MESSAGE = " 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.";
private String serviceName;
@@ -71,9 +74,6 @@ public abstract class BaseClient {
protected void login() {
ClassLoader prevCl = Thread.currentThread().getContextClassLoader();
- 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.";
try {
//Thread.currentThread().setContextClassLoader(configHolder.getClassLoader());
String lookupPrincipal = SecureClientLogin.getPrincipal(configHolder.getLookupPrincipal(), java.net.InetAddress.getLocalHost().getCanonicalHostName());
@@ -88,13 +88,7 @@ public abstract class BaseClient {
String userName = configHolder.getUserName();
if(StringUtils.isEmpty(lookupPrincipal) || StringUtils.isEmpty(lookupKeytab)){
if (userName == null) {
- String msgDesc = "Unable to find login username for hadoop environment, ["
- + serviceName + "]";
- HadoopException hdpException = new HadoopException(msgDesc);
- hdpException.generateResponseDataMap(false, msgDesc + errMsg, msgDesc + errMsg,
- null, null);
-
- throw hdpException;
+ throw createException("Unable to find login username for hadoop environment, [" + serviceName + "]", null);
}
String keyTabFile = configHolder.getKeyTabFile();
if (keyTabFile != null) {
@@ -139,25 +133,26 @@ public abstract class BaseClient {
}
}
} catch (IOException ioe) {
- String msgDesc = "Unable to login to Hadoop environment ["
- + serviceName + "]";
-
- HadoopException hdpException = new HadoopException(msgDesc, ioe);
- hdpException.generateResponseDataMap(false, getMessage(ioe) + errMsg,
- msgDesc + errMsg, null, null);
- throw hdpException;
+ throw createException(ioe);
} catch (SecurityException se) {
- String msgDesc = "Unable to login to Hadoop environment ["
- + serviceName + "]";
- HadoopException hdpException = new HadoopException(msgDesc, se);
- hdpException.generateResponseDataMap(false, getMessage(se) + errMsg,
- msgDesc + errMsg, null, null);
- throw hdpException;
+ throw createException(se);
} finally {
Thread.currentThread().setContextClassLoader(prevCl);
}
}
+ private HadoopException createException(Exception exp) {
+ return createException("Unable to login to Hadoop environment [" + serviceName + "]", exp);
+ }
+
+ private HadoopException createException(String msgDesc, Exception exp) {
+ HadoopException hdpException = new HadoopException(msgDesc, exp);
+ final String fullDescription = exp != null ? getMessage(exp) : msgDesc;
+ hdpException.generateResponseDataMap(false, fullDescription + DEFAULT_ERROR_MESSAGE,
+ msgDesc + DEFAULT_ERROR_MESSAGE, null, null);
+ return hdpException;
+ }
+
public String getSerivceName() {
return serviceName;
}
@@ -183,10 +178,9 @@ public abstract class BaseClient {
public static String getMessage(Throwable excp) {
List<String> errList = new ArrayList<>();
while (excp != null) {
- if (!errList.contains(excp.getMessage() + ". \n")) {
- if (excp.getMessage() != null && !(excp.getMessage().equalsIgnoreCase(""))) {
- errList.add(excp.getMessage() + ". \n");
- }
+ String message = excp.getMessage();
+ if (StringUtils.isNotEmpty(message) && !errList.contains(message + ". \n")) {
+ errList.add(message + ". \n");
}
excp = excp.getCause();
}