Repository: incubator-ranger Updated Branches: refs/heads/master 0a160d601 -> 1f138601a
Fixing some whitespace issues Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/1f138601 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/1f138601 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/1f138601 Branch: refs/heads/master Commit: 1f138601aaf8da82c9ba04f39ff0131d70b33ed8 Parents: 0a160d6 Author: Colm O hEigeartaigh <cohei...@apache.org> Authored: Mon Oct 17 12:10:09 2016 +0100 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Mon Oct 17 12:10:09 2016 +0100 ---------------------------------------------------------------------- .../hadoop/utils/RangerCredentialProvider.java | 88 ++++++++++---------- .../utils/RangerCredentialProviderTest.java | 23 +++-- 2 files changed, 54 insertions(+), 57 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/1f138601/agents-cred/src/main/java/org/apache/ranger/authorization/hadoop/utils/RangerCredentialProvider.java ---------------------------------------------------------------------- diff --git a/agents-cred/src/main/java/org/apache/ranger/authorization/hadoop/utils/RangerCredentialProvider.java b/agents-cred/src/main/java/org/apache/ranger/authorization/hadoop/utils/RangerCredentialProvider.java index a61d81b..9571be8 100644 --- a/agents-cred/src/main/java/org/apache/ranger/authorization/hadoop/utils/RangerCredentialProvider.java +++ b/agents-cred/src/main/java/org/apache/ranger/authorization/hadoop/utils/RangerCredentialProvider.java @@ -17,7 +17,7 @@ * under the License. */ - package org.apache.ranger.authorization.hadoop.utils; +package org.apache.ranger.authorization.hadoop.utils; import java.util.List; @@ -30,48 +30,48 @@ import org.apache.commons.logging.LogFactory; public final class RangerCredentialProvider { - private static Log LOG = LogFactory.getLog(RangerCredentialProvider.class); - - private static final RangerCredentialProvider CRED_PROVIDER = new RangerCredentialProvider(); - - protected RangerCredentialProvider() { - // - } - - public static RangerCredentialProvider getInstance() { - return CRED_PROVIDER; - } - - public char[] getCredentialString(String url, String alias) { - List<CredentialProvider> providers = getCredentialProviders(url); - - if(providers != null) { - for( CredentialProvider provider: providers) { - try { - CredentialProvider.CredentialEntry credEntry = provider.getCredentialEntry(alias); - - if (credEntry != null) { - return credEntry.getCredential(); - } - } catch(Exception ie) { - LOG.error("Unable to get the Credential Provider from the Configuration", ie); - } - } - } - return null; - } - - List<CredentialProvider> getCredentialProviders(String url){ - try { - Configuration conf = new Configuration(); - - conf.set(CredentialProviderFactory.CREDENTIAL_PROVIDER_PATH, url); - - return CredentialProviderFactory.getProviders(conf); - } catch(Exception ie) { - LOG.error("Unable to get the Credential Provider from the Configuration", ie); - } - return null; - } + private static Log LOG = LogFactory.getLog(RangerCredentialProvider.class); + + private static final RangerCredentialProvider CRED_PROVIDER = new RangerCredentialProvider(); + + protected RangerCredentialProvider() { + // + } + + public static RangerCredentialProvider getInstance() { + return CRED_PROVIDER; + } + + public char[] getCredentialString(String url, String alias) { + List<CredentialProvider> providers = getCredentialProviders(url); + + if (providers != null) { + for (CredentialProvider provider: providers) { + try { + CredentialProvider.CredentialEntry credEntry = provider.getCredentialEntry(alias); + + if (credEntry != null) { + return credEntry.getCredential(); + } + } catch(Exception ie) { + LOG.error("Unable to get the Credential Provider from the Configuration", ie); + } + } + } + return null; + } + + List<CredentialProvider> getCredentialProviders(String url){ + try { + Configuration conf = new Configuration(); + + conf.set(CredentialProviderFactory.CREDENTIAL_PROVIDER_PATH, url); + + return CredentialProviderFactory.getProviders(conf); + } catch(Exception ie) { + LOG.error("Unable to get the Credential Provider from the Configuration", ie); + } + return null; + } } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/1f138601/agents-cred/src/test/java/org/apache/ranger/authorization/hadoop/utils/RangerCredentialProviderTest.java ---------------------------------------------------------------------- diff --git a/agents-cred/src/test/java/org/apache/ranger/authorization/hadoop/utils/RangerCredentialProviderTest.java b/agents-cred/src/test/java/org/apache/ranger/authorization/hadoop/utils/RangerCredentialProviderTest.java index f583655..0b815fc 100644 --- a/agents-cred/src/test/java/org/apache/ranger/authorization/hadoop/utils/RangerCredentialProviderTest.java +++ b/agents-cred/src/test/java/org/apache/ranger/authorization/hadoop/utils/RangerCredentialProviderTest.java @@ -71,16 +71,13 @@ public class RangerCredentialProviderTest { System.out.println("Keystore File [" + ksFile.getAbsolutePath() + "] is available - and deleting"); ksFile.delete(); System.out.println("Keystore File [" + ksFile.getAbsolutePath() + "] is deleted."); - } - else { + } else { System.out.println("Keystore File [" + ksFile.getAbsolutePath() + "] is not available"); } - } - else { + } else { System.out.println("Keystore File is NULL"); } - } - catch(Throwable t) { + } catch(Throwable t) { t.printStackTrace(); } @@ -88,12 +85,12 @@ public class RangerCredentialProviderTest { CredentialShell cs = new CredentialShell(); cs.setConf(conf); try { - ret =cs.run(argsCreate); + ret = cs.run(argsCreate); } catch (Exception e) { throw e; } - assertEquals(0,ret); - System.out.println("(1) Number of active Threads : " + Thread.activeCount() ); + assertEquals(0, ret); + System.out.println("(1) Number of active Threads : " + Thread.activeCount()); listThreads(); } @@ -112,7 +109,7 @@ public class RangerCredentialProviderTest { if (providers != null) { assertTrue(url.equals(providers.get(0).toString())); } - System.out.println("(2) Number of active Threads : " + Thread.activeCount() ); + System.out.println("(2) Number of active Threads : " + Thread.activeCount()); listThreads(); } @@ -122,9 +119,9 @@ public class RangerCredentialProviderTest { cp = new RangerCredentialProvider(); providers = cp.getCredentialProviders(url); if (providers != null) { - assertTrue("PassworD123".equals(new String(cp.getCredentialString(url,"TestCredential001")))); + assertTrue("PassworD123".equals(new String(cp.getCredentialString(url, "TestCredential001")))); } - System.out.println("(3) Number of active Threads : " + Thread.activeCount() ); + System.out.println("(3) Number of active Threads : " + Thread.activeCount()); listThreads(); } @@ -145,7 +142,7 @@ public class RangerCredentialProviderTest { listThreads(); } - private static void listThreads() { + private static void listThreads() { int ac = Thread.activeCount(); if (ac > 0) { Thread[] tlist = new Thread[ac];
