Improved logging for VNF image extraction

[aai/babel.git] / src / main / java / org / onap / aai / auth / AAIMicroServiceAuthCore.java

diff --git a/src/main/java/org/onap/aai/auth/AAIMicroServiceAuthCore.java b/src/main/java/org/onap/aai/auth/AAIMicroServiceAuthCore.java
index b148440..ee5fb26 100644 (file)
--- a/src/main/java/org/onap/aai/auth/AAIMicroServiceAuthCore.java
+++ b/src/main/java/org/onap/aai/auth/AAIMicroServiceAuthCore.java
@@ -2,8 +2,8 @@
  * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * Copyright © 2017 European Software Marketing Ltd.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 European Software Marketing Ltd.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,8 +17,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 package org.onap.aai.auth;
 
@@ -38,21 +36,19 @@ import java.util.Timer;
 import java.util.TimerTask;
 import java.util.concurrent.TimeUnit;
 import org.onap.aai.babel.logging.ApplicationMsgs;
-import org.onap.aai.cl.api.Logger;
-import org.onap.aai.cl.eelf.LoggerFactory;
+import org.onap.aai.babel.logging.LogHelper;
 
-/**
- * Authentication and authorization by user and role.
- *
- */
+/** Authentication and authorization by user and role. */
 public class AAIMicroServiceAuthCore {
 
-    private static Logger applicationLogger = LoggerFactory.getInstance().getLogger(AAIMicroServiceAuthCore.class);
+    private static LogHelper applicationLogger = LogHelper.INSTANCE;
+
+    private static final String CONFIG_HOME = System.getProperty("CONFIG_HOME");
 
     public static final String FILESEP =
             (System.getProperty("file.separator") == null) ? "/" : System.getProperty("file.separator");
-    public static final String APPCONFIG_DIR = (System.getProperty("CONFIG_HOME") == null)
-            ? System.getProperty("AJSC_HOME") + FILESEP + "appconfig" : System.getProperty("CONFIG_HOME");
+    public static final String APPCONFIG_DIR =
+            (CONFIG_HOME == null) ? System.getProperty("APP_HOME") + FILESEP + "appconfig" : CONFIG_HOME;
 
     private static String appConfigAuthDir = APPCONFIG_DIR + FILESEP + "auth";
     private static String defaultAuthFileName = appConfigAuthDir + FILESEP + "auth_policy.json";
@@ -83,7 +79,6 @@ public class AAIMicroServiceAuthCore {
     }
 
     public static synchronized void init(String authPolicyFile) throws AAIAuthException {
-
         try {
             policyAuthFileName = AAIMicroServiceAuthCore.getConfigFile(authPolicyFile);
         } catch (IOException e) {
@@ -92,7 +87,7 @@ public class AAIMicroServiceAuthCore {
             throw new AAIAuthException(e.getMessage());
         }
         if (policyAuthFileName == null) {
-            throw new AAIAuthException("Auth policy file could not be found");
+            throw new AAIAuthException("Auth policy file could not be found" + CONFIG_HOME + APPCONFIG_DIR);
         }
         AAIMicroServiceAuthCore.reloadUsers();
 
@@ -237,7 +232,6 @@ public class AAIMicroServiceAuthCore {
         public void setUser(String myuser) {
             this.username = myuser;
         }
-
     }
 
     public static class AAIAuthRole {
@@ -259,7 +253,7 @@ public class AAIMicroServiceAuthCore {
         }
 
         public boolean hasAllowedFunction(String afunc) {
-            return this.allowedFunctions.contains(afunc) ? true : false;
+            return this.allowedFunctions.contains(afunc);
         }
     }