From a649fd1b3c8308b4c7cc2018965c93bff9d7eb54 Mon Sep 17 00:00:00 2001 From: Sai Gandham Date: Wed, 30 Jan 2019 08:44:44 -0600 Subject: Update shiro logging and sl4j init Issue-ID: AAF-655 Change-Id: I1e1439efbee5900c82a6065a0581faae15622581 Signed-off-by: Sai Gandham --- .../main/java/org/onap/aaf/cadi/shiro/AAFAuthenticationInfo.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'shiro/src/main/java/org/onap/aaf/cadi/shiro/AAFAuthenticationInfo.java') diff --git a/shiro/src/main/java/org/onap/aaf/cadi/shiro/AAFAuthenticationInfo.java b/shiro/src/main/java/org/onap/aaf/cadi/shiro/AAFAuthenticationInfo.java index 4e5d59b..45bdadc 100644 --- a/shiro/src/main/java/org/onap/aaf/cadi/shiro/AAFAuthenticationInfo.java +++ b/shiro/src/main/java/org/onap/aaf/cadi/shiro/AAFAuthenticationInfo.java @@ -24,7 +24,8 @@ import java.nio.ByteBuffer; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.shiro.authc.AuthenticationInfo; import org.apache.shiro.authc.AuthenticationToken; import org.apache.shiro.authc.UsernamePasswordToken; @@ -35,7 +36,7 @@ import org.onap.aaf.cadi.Hash; public class AAFAuthenticationInfo implements AuthenticationInfo { private static final long serialVersionUID = -1502704556864321020L; - final static Logger logger = Logger.getLogger(AAFAuthenticationInfo.class); + final static Logger logger = LoggerFactory.getLogger(AAFAuthenticationInfo.class); // We assume that Shiro is doing Memory Only, and this salt is not needed cross process private final static int salt = new SecureRandom().nextInt(); @@ -50,14 +51,12 @@ public class AAFAuthenticationInfo implements AuthenticationInfo { hash = getSaltedCred(password); } @Override - public byte[] getCredentials() { - logger.debug("AAFAuthenticationInfo.getCredentials"); + public byte[] getCredentials() { return hash; } @Override public PrincipalCollection getPrincipals() { - logger.debug( "AAFAuthenticationInfo.getPrincipals"); return apc; } -- cgit 1.2.3-korg