Repository: atlas Updated Branches: refs/heads/branch-1.0 9e76ed2eb -> 042f5c2e7
ATLAS-2860: Remove dependency on atlas-application.properties for AtlasClient. Signed-off-by: Madhan Neethiraj <mad...@apache.org> (cherry picked from commit 6b953b59c4b1eb05ee4ddd2234b81cd98451ccc2) Project: http://git-wip-us.apache.org/repos/asf/atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/042f5c2e Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/042f5c2e Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/042f5c2e Branch: refs/heads/branch-1.0 Commit: 042f5c2e7a6ab4b18ec0e114a9b324896e866e54 Parents: 9e76ed2 Author: Ashutosh Mestry <ames...@hortonworks.com> Authored: Fri Sep 14 14:36:18 2018 -0700 Committer: Madhan Neethiraj <mad...@apache.org> Committed: Mon Sep 17 15:20:48 2018 -0700 ---------------------------------------------------------------------- .../java/org/apache/atlas/hbase/HBaseAtlasHookIT.java | 4 ++-- .../main/java/org/apache/atlas/AtlasBaseClient.java | 2 +- .../org/apache/atlas/security/SecureClientUtils.java | 7 +++---- .../java/org/apache/atlas/ApplicationProperties.java | 14 ++++++++++++-- 4 files changed, 18 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/atlas/blob/042f5c2e/addons/hbase-bridge/src/test/java/org/apache/atlas/hbase/HBaseAtlasHookIT.java ---------------------------------------------------------------------- diff --git a/addons/hbase-bridge/src/test/java/org/apache/atlas/hbase/HBaseAtlasHookIT.java b/addons/hbase-bridge/src/test/java/org/apache/atlas/hbase/HBaseAtlasHookIT.java index c0d0318..15bfbe3 100644 --- a/addons/hbase-bridge/src/test/java/org/apache/atlas/hbase/HBaseAtlasHookIT.java +++ b/addons/hbase-bridge/src/test/java/org/apache/atlas/hbase/HBaseAtlasHookIT.java @@ -148,7 +148,7 @@ public class HBaseAtlasHookIT { private void createAtlasClient() { try { org.apache.commons.configuration.Configuration configuration = ApplicationProperties.get(); - String[] atlasEndPoint = configuration.getStringArray(HBaseAtlasHook.ATTR_ATLAS_ENDPOINT); + String[] atlasEndPoint = configuration.getStringArray(HBaseAtlasHook.ATTR_ATLAS_ENDPOINT); configuration.setProperty("atlas.cluster.name", CLUSTER_NAME); @@ -163,7 +163,7 @@ public class HBaseAtlasHookIT { } if (AuthenticationUtil.isKerberosAuthenticationEnabled()) { - atlasClient = new AtlasClientV2(configuration, atlasEndPoint, null); + atlasClient = new AtlasClientV2(atlasEndPoint); } else { atlasClient = new AtlasClientV2(configuration, atlasEndPoint, new String[]{"admin", "admin"}); } http://git-wip-us.apache.org/repos/asf/atlas/blob/042f5c2e/client/common/src/main/java/org/apache/atlas/AtlasBaseClient.java ---------------------------------------------------------------------- diff --git a/client/common/src/main/java/org/apache/atlas/AtlasBaseClient.java b/client/common/src/main/java/org/apache/atlas/AtlasBaseClient.java index 4464ade..7ca656d 100644 --- a/client/common/src/main/java/org/apache/atlas/AtlasBaseClient.java +++ b/client/common/src/main/java/org/apache/atlas/AtlasBaseClient.java @@ -258,7 +258,7 @@ public abstract class AtlasBaseClient { // to create a // configuration object, persist it, then subsequently pass in an empty configuration to SSLFactory try { - SecureClientUtils.persistSSLClientConfiguration(configuration); + SecureClientUtils.persistSSLClientConfiguration(configuration, System.getProperty("atlas.conf") ); } catch (Exception e) { LOG.info("Error processing client configuration.", e); } http://git-wip-us.apache.org/repos/asf/atlas/blob/042f5c2e/client/common/src/main/java/org/apache/atlas/security/SecureClientUtils.java ---------------------------------------------------------------------- diff --git a/client/common/src/main/java/org/apache/atlas/security/SecureClientUtils.java b/client/common/src/main/java/org/apache/atlas/security/SecureClientUtils.java index d5392b2..550ef5a 100644 --- a/client/common/src/main/java/org/apache/atlas/security/SecureClientUtils.java +++ b/client/common/src/main/java/org/apache/atlas/security/SecureClientUtils.java @@ -163,8 +163,7 @@ public class SecureClientUtils { connection.setReadTimeout(socketTimeout); } - private static File getSSLClientFile() throws AtlasException { - String confLocation = System.getProperty("atlas.conf"); + private static File getSSLClientFile(String confLocation) throws AtlasException { File sslDir; try { if (confLocation == null) { @@ -185,11 +184,11 @@ public class SecureClientUtils { return new File(sslDir, SecurityProperties.SSL_CLIENT_PROPERTIES); } - public static void persistSSLClientConfiguration(org.apache.commons.configuration.Configuration clientConfig) + public static void persistSSLClientConfiguration(org.apache.commons.configuration.Configuration clientConfig, String confLocation) throws AtlasException, IOException { //trust settings Configuration configuration = new Configuration(false); - File sslClientFile = getSSLClientFile(); + File sslClientFile = getSSLClientFile(confLocation); if (!sslClientFile.exists()) { configuration.set("ssl.client.truststore.type", "jks"); configuration.set("ssl.client.truststore.location", clientConfig.getString(TRUSTSTORE_FILE_KEY)); http://git-wip-us.apache.org/repos/asf/atlas/blob/042f5c2e/intg/src/main/java/org/apache/atlas/ApplicationProperties.java ---------------------------------------------------------------------- diff --git a/intg/src/main/java/org/apache/atlas/ApplicationProperties.java b/intg/src/main/java/org/apache/atlas/ApplicationProperties.java index 9e2efb5..53be543 100644 --- a/intg/src/main/java/org/apache/atlas/ApplicationProperties.java +++ b/intg/src/main/java/org/apache/atlas/ApplicationProperties.java @@ -68,11 +68,21 @@ public final class ApplicationProperties extends PropertiesConfiguration { if (instance == null) { synchronized (ApplicationProperties.class) { if (instance == null) { - instance = get(APPLICATION_PROPERTIES); - InMemoryJAASConfiguration.init(instance); + set(get(APPLICATION_PROPERTIES)); } } } + + return instance; + } + + public static Configuration set(Configuration configuration) throws AtlasException { + synchronized (ApplicationProperties.class) { + instance = configuration; + + InMemoryJAASConfiguration.init(instance); + } + return instance; }