[airavata-custos] 17/45: code refactoring

[smarru]

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

smarru pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata-custos.git

commit 6fa92d10cbbd31ca34636bd609e120a9351757bd
Author: Aarushi <aarushiibi...@gmail.com>
AuthorDate: Mon Aug 12 12:27:48 2019 -0400

    code refactoring
---
 .../authentication/service/AuthenticationServiceClient.java  |  2 +-
 .../org/apache/custos/commons/utils/ApplicationSettings.java | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git 
a/custos-client/src/main/java/org/apache/custos/client/authentication/service/AuthenticationServiceClient.java
 
b/custos-client/src/main/java/org/apache/custos/client/authentication/service/AuthenticationServiceClient.java
index 7ef7cf4..4fc0444 100644
--- 
a/custos-client/src/main/java/org/apache/custos/client/authentication/service/AuthenticationServiceClient.java
+++ 
b/custos-client/src/main/java/org/apache/custos/client/authentication/service/AuthenticationServiceClient.java
@@ -8,7 +8,7 @@ import org.apache.thrift.transport.TSocket;
 import org.apache.thrift.transport.TTransport;
 import org.apache.thrift.transport.TTransportException;
 
-    public class AuthenticationServiceClient {
+public class AuthenticationServiceClient {
 
     public static CustosAuthenticationService.Client 
createAuthenticationServiceClient(String serverHost, int serverPort)  throws 
CustosAuthenticationServiceException {
         try {
diff --git 
a/custos-commons/src/main/java/org/apache/custos/commons/utils/ApplicationSettings.java
 
b/custos-commons/src/main/java/org/apache/custos/commons/utils/ApplicationSettings.java
index e494120..fdcdf97 100644
--- 
a/custos-commons/src/main/java/org/apache/custos/commons/utils/ApplicationSettings.java
+++ 
b/custos-commons/src/main/java/org/apache/custos/commons/utils/ApplicationSettings.java
@@ -14,7 +14,7 @@ import java.util.*;
 import java.util.regex.Pattern;
 
 public class ApplicationSettings {
-    //private final static Logger logger = 
LoggerFactory.getLogger(ApplicationSettings.class);
+    private final static Logger logger = 
LoggerFactory.getLogger(ApplicationSettings.class);
     protected static ApplicationSettings INSTANCE;
     private Exception propertyLoadException;
     public static final String SERVER_PROPERTIES="custos-server.properties";
@@ -31,11 +31,11 @@ public class ApplicationSettings {
         URL url = getPropertyFileURL();
         try {
             properties.load(url.openStream());
-            //logger.info("Settings loaded from "+url.toString());
+            logger.info("Settings loaded from "+url.toString());
             URL[] externalSettingsFileURLs = getExternalSettingsFileURLs();
             for (URL externalSettings : externalSettingsFileURLs) {
                 mergeSettingsImpl(externalSettings.openStream());
-                //logger.info("External settings merged from "+url.toString());
+                logger.info("External settings merged from "+url.toString());
             }
         } catch (Exception e) {
             propertyLoadException=e;
@@ -54,7 +54,7 @@ public class ApplicationSettings {
             for (String externalSettingFile : externalSettingFiles) {
                 URL externalSettingFileURL = 
ApplicationSettings.loadFile(externalSettingFile);
                 if (externalSettingFileURL==null){
-                    //logger.warn("Could not file external settings file 
"+externalSettingFile);
+                    logger.warn("Could not file external settings file 
"+externalSettingFile);
                 }else{
                     externalSettingsFileURLs.add(externalSettingFileURL);
                 }
@@ -81,7 +81,7 @@ public class ApplicationSettings {
                     return asfile.toURI().toURL();
                 }
             } catch (MalformedURLException e) {
-                //logger.error("Error parsing the file from 
custos.config.dir", custosConfigDir);
+                logger.error("Error parsing the file from custos.config.dir", 
custosConfigDir);
             }
         }
 
@@ -114,7 +114,7 @@ public class ApplicationSettings {
                 throw new ApplicationSettingsException(url.getPath(), e);
             }
         }else{
-            //logger.warn("Properties cannot be updated to location 
"+url.toString());
+            logger.warn("Properties cannot be updated to location 
"+url.toString());
         }
     }
     private String getSettingImpl(String key, String defaultValue){