Merge "Sonar fixes related to exceptions"

[aaf/authz.git] / cadi / aaf / src / main / java / org / onap / aaf / cadi / oauth / TokenPerm.java

diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/oauth/TokenPerm.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/oauth/TokenPerm.java
index 4a0259a..bb33bc7 100644 (file)
--- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/oauth/TokenPerm.java
+++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/oauth/TokenPerm.java
@@ -42,7 +42,7 @@ import aaf.v2_0.Perms;
 import aafoauth.v2_0.Introspect;
 
 public class TokenPerm extends Persisting<Introspect>{
-       private static final List<AAFPermission> NULL_PERMS = new ArrayList<AAFPermission>();
+       private static final List<AAFPermission> NULL_PERMS = new ArrayList<>();
        private Introspect introspect;
        private List<AAFPermission> perms;
        private String scopes;
@@ -99,7 +99,7 @@ public class TokenPerm extends Persisting<Introspect>{
                        while((pd = ij.parse(r,pd.reuse())).valid()) {
                                switch(pd.event) {
                                        case Parse.START_DOC:
-                                               perms = new ArrayList<AAFPermission>();
+                                               perms = new ArrayList<>();
                                                break;
                                        case Parse.START_ARRAY:
                                                inPerms = "perm".equals(pd.name);
@@ -141,13 +141,16 @@ public class TokenPerm extends Persisting<Introspect>{
        
        // Gathering object for parsing objects, then creating AAF Permission
        private static class PermInfo {
-               public String type,instance,action;
+               public String ns,type,instance,action;
                public void clear() {
-                       type=instance=action=null;
+                       ns=type=instance=action=null;
                }
                public void eval(Parsed<State> pd) {
                        if(pd.hasName()) {
                                switch(pd.name) {
+                                       case "ns":
+                                               ns=pd.sb.toString();
+                                               break;
                                        case "type":
                                                type=pd.sb.toString();
                                                break;
@@ -162,7 +165,7 @@ public class TokenPerm extends Persisting<Introspect>{
                }
                public AAFPermission create() {
                        if(type!=null && instance!=null && action !=null) {
-                               return new AAFPermission(type, instance, action);
+                               return new AAFPermission(ns,type, instance, action);
                        } else {
                                return null;
                        }