From e0addf5b588a1244f9679becd90999dfcb4c3a94 Mon Sep 17 00:00:00 2001 From: "ITSERVICES\\rb7147" Date: Tue, 25 Apr 2017 11:46:00 -0400 Subject: Policy 1707 commit to LF Change-Id: Ibe6f01d92f9a434c040abb05d5386e89d675ae65 Signed-off-by: ITSERVICES\rb7147 --- .../policy/pdp/rest/restAuth/AuthenticationService.java | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/restAuth/AuthenticationService.java') diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/restAuth/AuthenticationService.java b/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/restAuth/AuthenticationService.java index c426b6002..5a6258032 100644 --- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/restAuth/AuthenticationService.java +++ b/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/restAuth/AuthenticationService.java @@ -23,11 +23,8 @@ package org.openecomp.policy.pdp.rest.restAuth; import java.util.Base64; import java.util.StringTokenizer; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.openecomp.policy.rest.XACMLRestProperties; -import org.openecomp.policy.xacml.api.XACMLErrorConstants; import com.att.research.xacml.util.XACMLProperties; import org.openecomp.policy.common.logging.eelf.MessageCodes; @@ -36,7 +33,6 @@ import org.openecomp.policy.common.logging.eelf.PolicyLogger; public class AuthenticationService { private String pdpID = XACMLProperties.getProperty(XACMLRestProperties.PROP_PDP_USERID); private String pdpPass = XACMLProperties.getProperty(XACMLRestProperties.PROP_PDP_PASS); - private static final Log logger = LogFactory.getLog(AuthenticationService.class); public boolean authenticate(String authCredentials) { @@ -49,8 +45,6 @@ public class AuthenticationService { byte[] decodedBytes = Base64.getDecoder().decode(encodedUserPassword); usernameAndPassword = new String(decodedBytes, "UTF-8"); } catch (Exception e) { - logger.error(XACMLErrorConstants.ERROR_SYSTEM_ERROR + e); - // TODO:EELF Cleanup - Remove logger PolicyLogger.error(MessageCodes.ERROR_SYSTEM_ERROR, e, ""); return false; } @@ -58,12 +52,8 @@ public class AuthenticationService { final StringTokenizer tokenizer = new StringTokenizer(usernameAndPassword, ":"); final String username = tokenizer.nextToken(); final String password = tokenizer.nextToken(); - - boolean authenticationStatus = pdpID.equals(username) && pdpPass.equals(password); - return authenticationStatus; + return pdpID.equals(username) && pdpPass.equals(password); }catch (Exception e){ - logger.error(XACMLErrorConstants.ERROR_SYSTEM_ERROR + e); - // TODO:EELF Cleanup - Remove logger PolicyLogger.error(MessageCodes.ERROR_SYSTEM_ERROR, e, ""); return false; } -- cgit 1.2.3-korg