You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by pr...@apache.org on 2019/05/21 03:28:14 UTC

[ranger] branch master updated: RANGER-2434: Remove dependency from com.google.common.base.Objects

This is an automated email from the ASF dual-hosted git repository.

pradeep pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ranger.git


The following commit(s) were added to refs/heads/master by this push:
     new 50d7d0c  RANGER-2434: Remove dependency from com.google.common.base.Objects
50d7d0c is described below

commit 50d7d0cc3a33b8d1b89c8ba854e424fc8f86a0a8
Author: Pradeep <pr...@apache.org>
AuthorDate: Sat May 18 18:59:41 2019 +0530

    RANGER-2434: Remove dependency from com.google.common.base.Objects
---
 .../apache/ranger/plugin/util/RangerSslHelper.java | 26 ++++++++++++----------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerSslHelper.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerSslHelper.java
index 5fc3358..ff536e6 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerSslHelper.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerSslHelper.java
@@ -46,8 +46,6 @@ import org.apache.hadoop.conf.Configuration;
 import org.apache.ranger.authorization.hadoop.utils.RangerCredentialProvider;
 import org.apache.ranger.authorization.utils.StringUtil;
 
-import com.google.common.base.Objects;
-
 public class RangerSslHelper {
 	private static final Log LOG = LogFactory.getLog(RangerSslHelper.class);
 
@@ -130,16 +128,7 @@ public class RangerSslHelper {
 			mTrustStoreFile  = conf.get(RANGER_POLICYMGR_TRUSTSTORE_FILE);
 
 			if (LOG.isDebugEnabled()) {
-				LOG.debug(Objects.toStringHelper("RangerSslHelper")
-					.add("keyStoreAlias", mKeyStoreAlias)
-					.add("keyStoreFile", mKeyStoreFile)
-					.add("keyStoreType", mKeyStoreType)
-					.add("keyStoreURL", mKeyStoreURL)
-					.add("trustStoreAlias", mTrustStoreAlias)
-					.add("trustStoreFile", mTrustStoreFile)
-					.add("trustStoreType", mTrustStoreType)
-					.add("trustStoreURL", mTrustStoreURL)
-					.toString());
+				LOG.debug(toString());
 			}
 		}
 		catch(IOException ioe) {
@@ -284,4 +273,17 @@ public class RangerSslHelper {
 			}
 		}
 	}
+
+	@Override
+	public String toString() {
+		return "keyStoreAlias=" + mKeyStoreAlias + ", "
+				+ "keyStoreFile=" + mKeyStoreFile + ", "
+				+ "keyStoreType="+ mKeyStoreType + ", "
+				+ "keyStoreURL=" + mKeyStoreURL + ", "
+				+ "trustStoreAlias=" + mTrustStoreAlias + ", "
+				+ "trustStoreFile=" + mTrustStoreFile + ", "
+				+ "trustStoreType=" + mTrustStoreType + ", "
+				+ "trustStoreURL=" + mTrustStoreURL
+				;
+	}
 }