diff options
Diffstat (limited to 'shiro/src')
| -rw-r--r-- | shiro/src/main/java/org/onap/aaf/cadi/shiro/AAFRealm.java | 4 | ||||
| -rw-r--r-- | shiro/src/test/java/org/onap/aaf/cadi/shiro/test/JU_AAFRealm.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/shiro/src/main/java/org/onap/aaf/cadi/shiro/AAFRealm.java b/shiro/src/main/java/org/onap/aaf/cadi/shiro/AAFRealm.java index 006547a..ccdaf73 100644 --- a/shiro/src/main/java/org/onap/aaf/cadi/shiro/AAFRealm.java +++ b/shiro/src/main/java/org/onap/aaf/cadi/shiro/AAFRealm.java @@ -89,7 +89,7 @@ public class AAFRealm extends AuthorizingRealm { String err; try { err = authn.validate(upt.getUsername(),password); - } catch (IOException|CadiException e) { + } catch (IOException e) { err = "Credential cannot be validated"; access.log(e, err); } @@ -122,7 +122,7 @@ public class AAFRealm extends AuthorizingRealm { protected AAFAuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals) { access.log(Level.DEBUG, "AAFRealm.doGetAuthenthorizationInfo"); Principal bait = (Principal)principals.getPrimaryPrincipal(); - List<Permission> pond = new ArrayList<Permission>(); + List<Permission> pond = new ArrayList<>(); authz.fishAll(bait,pond); return new AAFAuthorizationInfo(access,bait,pond); diff --git a/shiro/src/test/java/org/onap/aaf/cadi/shiro/test/JU_AAFRealm.java b/shiro/src/test/java/org/onap/aaf/cadi/shiro/test/JU_AAFRealm.java index add449c..591a56c 100644 --- a/shiro/src/test/java/org/onap/aaf/cadi/shiro/test/JU_AAFRealm.java +++ b/shiro/src/test/java/org/onap/aaf/cadi/shiro/test/JU_AAFRealm.java @@ -59,9 +59,9 @@ public class JU_AAFRealm { // } // } - private void testAPerm(boolean expect,AuthorizationInfo azi, String type, String instance, String action) { + private void testAPerm(boolean expect, AuthorizationInfo azi, String name, String type, String instance, String action) { - AAFShiroPermission testPerm = new AAFShiroPermission(new AAFPermission(type,instance,action,new ArrayList<String>())); + AAFShiroPermission testPerm = new AAFShiroPermission(new AAFPermission(type,name,instance,action,new ArrayList<String>())); boolean any = false; for(Permission p : azi.getObjectPermissions()) { |