From 4a698c2e3d926fd69673eea8b15a78bc7770a29c Mon Sep 17 00:00:00 2001
From: Instrumental <jonathan.gathman@att.com>
Date: Fri, 22 Feb 2019 13:52:58 -0600
Subject: Add Multi-Realm class handling

Also, improve Logging
Issue-ID: AAF-771
Change-Id: I4cf286b5c474596f5e824e5204598cf0c1bb014c
Signed-off-by: Instrumental <jonathan.gathman@att.com>
---
 .../org/onap/aaf/cadi/shiro/AAFAuthorizationInfo.java   | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

(limited to 'shiro/src/main/java/org/onap/aaf/cadi/shiro/AAFAuthorizationInfo.java')

diff --git a/shiro/src/main/java/org/onap/aaf/cadi/shiro/AAFAuthorizationInfo.java b/shiro/src/main/java/org/onap/aaf/cadi/shiro/AAFAuthorizationInfo.java
index 4b0993b..fc0f4ff 100644
--- a/shiro/src/main/java/org/onap/aaf/cadi/shiro/AAFAuthorizationInfo.java
+++ b/shiro/src/main/java/org/onap/aaf/cadi/shiro/AAFAuthorizationInfo.java
@@ -29,8 +29,6 @@ import org.apache.shiro.authz.AuthorizationInfo;
 import org.apache.shiro.authz.Permission;
 import org.onap.aaf.cadi.Access;
 import org.onap.aaf.cadi.Access.Level;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * We treat "roles" and "permissions" in a similar way for first pass.
@@ -41,8 +39,6 @@ import org.slf4j.LoggerFactory;
 public class AAFAuthorizationInfo implements AuthorizationInfo {
 	private static final long serialVersionUID = -4805388954462426018L;
 	
-	final static  Logger logger =  LoggerFactory.getLogger(AAFAuthorizationInfo.class);
-	
 	private Access access;
 	private Principal bait;
 	private List<org.onap.aaf.cadi.Permission> pond;
@@ -55,7 +51,6 @@ public class AAFAuthorizationInfo implements AuthorizationInfo {
 		this.pond = pond;
 		sPerms=null;
 		oPerms=null;
-
 	}
 	
 	public Principal principal() {
@@ -64,7 +59,7 @@ public class AAFAuthorizationInfo implements AuthorizationInfo {
 	
 	@Override
 	public Collection<Permission> getObjectPermissions() {
-//		logger.info("AAFAuthorizationInfo.getObjectPermissions");
+		access.log(Level.DEBUG, "AAFAuthorizationInfo.getObjectPermissions");
 		synchronized(bait) {
 			if(oPerms == null) {
 				oPerms = new ArrayList<Permission>(); 
@@ -73,29 +68,25 @@ public class AAFAuthorizationInfo implements AuthorizationInfo {
 				}
 			}
 		}
-		
-		
 		return oPerms;
 	}
 
 	@Override
 	public Collection<String> getRoles() {
-//		logger.info("AAFAuthorizationInfo.getRoles");
+		access.log(Level.INFO,"AAFAuthorizationInfo.getRoles");
 		// Until we decide to make Roles available, tie into String based permissions.
 		return getStringPermissions();
 	}
 
 	@Override
 	public Collection<String> getStringPermissions() {
-       
-//		logger.info("AAFAuthorizationInfo.getStringPermissions");
+		access.log(Level.INFO,"AAFAuthorizationInfo.getStringPermissions");
 		synchronized(bait) {
 			if(sPerms == null) {
 				sPerms = new ArrayList<String>(); 
 				for(org.onap.aaf.cadi.Permission p : pond) {
 					sPerms.add(p.getKey().replace("|",":"));
-					logger.info("the user has  " +p.getKey());
-					
+					access.printf(Level.INFO,"the user has %s",p.getKey());
 				}
 			}
 		}
-- 
cgit 1.2.3-korg