X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Fbabel.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fauth%2FAAIMicroServiceAuthCore.java;h=6f000b8fb4a46269a9c53666ee75bb7b76cd450a;hp=b1484408d78ba6e1896327ca51a5c14cffd53e04;hb=66b3afa06776e9944ad515206d281d67747c9770;hpb=161f5a7d9b900ae34a4886d7f7fb01ea496f71eb diff --git a/src/main/java/org/onap/aai/auth/AAIMicroServiceAuthCore.java b/src/main/java/org/onap/aai/auth/AAIMicroServiceAuthCore.java index b148440..6f000b8 100644 --- 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,16 +36,12 @@ 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; public static final String FILESEP = (System.getProperty("file.separator") == null) ? "/" : System.getProperty("file.separator"); @@ -83,7 +77,6 @@ public class AAIMicroServiceAuthCore { } public static synchronized void init(String authPolicyFile) throws AAIAuthException { - try { policyAuthFileName = AAIMicroServiceAuthCore.getConfigFile(authPolicyFile); } catch (IOException e) { @@ -237,7 +230,6 @@ public class AAIMicroServiceAuthCore { public void setUser(String myuser) { this.username = myuser; } - } public static class AAIAuthRole {