ATLAS-2860: Remove dependency on atlas-application.properties for AtlasClient.

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"});
             }

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);
             }

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));

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;
     }