You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by ma...@apache.org on 2018/09/17 21:57:13 UTC
atlas git commit: ATLAS-2860: Remove dependency on
atlas-application.properties for AtlasClient.
Repository: atlas
Updated Branches:
refs/heads/branch-0.8 fb635ece9 -> 6b953b59c
ATLAS-2860: Remove dependency on atlas-application.properties for AtlasClient.
Signed-off-by: Madhan Neethiraj <ma...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/6b953b59
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/6b953b59
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/6b953b59
Branch: refs/heads/branch-0.8
Commit: 6b953b59c4b1eb05ee4ddd2234b81cd98451ccc2
Parents: fb635ec
Author: Ashutosh Mestry <am...@hortonworks.com>
Authored: Fri Sep 14 14:36:18 2018 -0700
Committer: Madhan Neethiraj <ma...@apache.org>
Committed: Mon Sep 17 14:40:14 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/6b953b59/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/6b953b59/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 d6f767e..ad92191 100644
--- a/client/common/src/main/java/org/apache/atlas/AtlasBaseClient.java
+++ b/client/common/src/main/java/org/apache/atlas/AtlasBaseClient.java
@@ -272,7 +272,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/6b953b59/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/6b953b59/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 a35bdfe..d81f2f2 100644
--- a/intg/src/main/java/org/apache/atlas/ApplicationProperties.java
+++ b/intg/src/main/java/org/apache/atlas/ApplicationProperties.java
@@ -61,11 +61,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;
}