1 files changed, 45 insertions, 10 deletions

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 0035626..247683a 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,6 +29,7 @@ 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.onap.aaf.cadi.aaf.AAFPermission;
 
 /**
  * We treat "roles" and "permissions" in a similar way for first pass.
@@ -42,15 +43,27 @@ public class AAFAuthorizationInfo implements AuthorizationInfo {
 	private Access access;
 	private Principal bait;
 	private List<org.onap.aaf.cadi.Permission> pond;
-	private ArrayList<String> sPerms;
-	private ArrayList<Permission> oPerms;
+	// Use these to save conversions
+	private List<org.onap.aaf.cadi.Permission> cPerms;
+	private List<Permission> oPerms;
+	private List<String> sPerms;
+
+	public AAFAuthorizationInfo(Access access, Principal bait) {
+		this.access = access;
+		this.bait = bait;
+		cPerms=null;
+		oPerms=null;
+		sPerms=null;
+		pond=null;
+	}
 
 	public AAFAuthorizationInfo(Access access, Principal bait, List<org.onap.aaf.cadi.Permission> pond) {
 		this.access = access;
 		this.bait = bait;
 		this.pond = pond;
-		sPerms=null;
 		oPerms=null;
+		sPerms=null;
+		cPerms=null;
 	}
 	
 	public Principal principal() {
@@ -62,9 +75,20 @@ public class AAFAuthorizationInfo implements AuthorizationInfo {
 		access.log(Level.DEBUG, "AAFAuthorizationInfo.getObjectPermissions");
 		synchronized(bait) {
 			if(oPerms == null) {
-				oPerms = new ArrayList<Permission>(); 
-				for(final org.onap.aaf.cadi.Permission p : pond) {
-					oPerms.add(new AAFShiroPermission(p));
+				if (pond != null) {
+					oPerms = new ArrayList<Permission>();
+					for(final org.onap.aaf.cadi.Permission p : pond) {
+						oPerms.add(new AAFShiroPermission(p));
+					}
+				} else {
+					oPerms = new ArrayList<>();
+					if (cPerms == null) {
+						cPerms = new ArrayList<>();
+						AAFRealm.singleton.authz.fishAll(bait, cPerms);
+					}
+					for (final org.onap.aaf.cadi.Permission p : cPerms) {
+						oPerms.add(new AAFShiroPermission(p));
+					}
 				}
 			}
 		}
@@ -83,10 +107,21 @@ public class AAFAuthorizationInfo implements AuthorizationInfo {
 		access.log(Level.DEBUG,"AAFAuthorizationInfo.getStringPermissions");
 		synchronized(bait) {
 			if(sPerms == null) {
-				sPerms = new ArrayList<String>(); 
-				for(org.onap.aaf.cadi.Permission p : pond) {
-					sPerms.add(p.getKey().replace("|",":"));
-					access.printf(Level.INFO,"%s has %s",bait.getName(),p.getKey());
+				if (pond != null) {
+					sPerms = new ArrayList<String>();
+					for(org.onap.aaf.cadi.Permission p : pond) {
+						sPerms.add(p.getKey().replace("|", ":"));
+						access.printf(Level.INFO, "%s has %s", bait.getName(), p.getKey());
+					}
+				} else {
+					sPerms = new ArrayList<>();
+					if (cPerms == null) {
+						cPerms = new ArrayList<>();
+						AAFRealm.singleton.authz.fishAll(bait, cPerms);
+					}
+					for (final org.onap.aaf.cadi.Permission p : cPerms) {
+						sPerms.add(p.getKey());
+					}
 				}
 			}
 		}