Merge "Sonar fixes related to exceptions"

[aaf/authz.git] / auth / auth-gui / src / main / java / org / onap / aaf / auth / gui / pages / RoleDetail.java

diff --git a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/RoleDetail.java b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/RoleDetail.java
index 37526b8..d7b0da0 100644 (file)
--- a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/RoleDetail.java
+++ b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/RoleDetail.java
@@ -87,6 +87,7 @@ public class RoleDetail extends Page {
         *
         */
        private static class Model extends TableData<AAF_GUI,AuthzTrans> {
+               private static final String ACCESS = "access";
                private Slot sRoleName,sRole,sUserRole,sMayWrite,sMayApprove,sMark,sNS;
                public Model(AuthzEnv env) {
                        sRoleName = env.slot(NAME+".role");
@@ -121,35 +122,38 @@ public class RoleDetail extends Page {
                                                        Future<Roles> fr = client.read("/authz/roles/"+pRole+"?ns",gui.getDF(Roles.class));
                                                        Future<UserRoles> fur = client.read("/authz/userRoles/role/"+pRole,gui.getDF(UserRoles.class));
                                                        if(fr.get(AAF_GUI.TIMEOUT)) {
-                                                               Role role = fr.value.getRole().get(0);
-                                                               trans.put(sRole, role);
-                                                               Boolean mayWrite = trans.fish(new AAFPermission(role.getNs()+".access",":role:"+role.getName(),"write"));
-                                                               trans.put(sMayWrite,mayWrite);
-                                                               Boolean mayApprove = trans.fish(new AAFPermission(role.getNs()+".access",":role:"+role.getName(),"approve"));
-                                                               trans.put(sMayApprove, mayApprove);
-                                                               
-                                                               if(mayWrite || mayApprove) {
-                                                                       Mark js = new Mark();
-                                                                       Mark fn = new Mark();
-                                                                       hgen.js(js)
-                                                                               .function(fn,"touchedDesc")
-                                                                               .li("d=document.getElementById('descText');",
-                                                                                       "if (d.orig == undefined ) {",
-                                                                                       "  d.orig = d.value;",
-                                                                                       "  d.addEventListener('keyup',changedDesc);",
-                                                                                       "  d.removeEventListener('keypress',touchedDesc);",
-                                                                                       "}").end(fn)
-                                                                               .function(fn,"changedDesc")
-                                                                               .li(
-                                                                                       "dcb=document.getElementById('descCB');",
-                                                                                       "d=document.getElementById('descText');",
-                                                                                       "dcb.checked= (d.orig != d.value)"
-                                                                               ).end(fn)
-                                                                               .end(js);
-
-                                                                       Mark mark = new Mark();
-                                                                       hgen.incr(mark,"form","method=post");
-                                                                       trans.put(sMark, mark);
+                                                               List<Role> roles = fr.value.getRole();
+                                                               if(!roles.isEmpty()) {
+                                                                       Role role = fr.value.getRole().get(0);
+                                                                       trans.put(sRole, role);
+                                                                       Boolean mayWrite = trans.fish(new AAFPermission(role.getNs(),ACCESS,":role:"+role.getName(),"write"));
+                                                                       trans.put(sMayWrite,mayWrite);
+                                                                       Boolean mayApprove = trans.fish(new AAFPermission(role.getNs(),ACCESS,":role:"+role.getName(),"approve"));
+                                                                       trans.put(sMayApprove, mayApprove);
+                                                                       
+                                                                       if(mayWrite || mayApprove) {
+                                                                               Mark js = new Mark();
+                                                                               Mark fn = new Mark();
+                                                                               hgen.js(js)
+                                                                                       .function(fn,"touchedDesc")
+                                                                                       .li("d=document.getElementById('descText');",
+                                                                                               "if (d.orig == undefined ) {",
+                                                                                               "  d.orig = d.value;",
+                                                                                               "  d.addEventListener('keyup',changedDesc);",
+                                                                                               "  d.removeEventListener('keypress',touchedDesc);",
+                                                                                               "}").end(fn)
+                                                                                       .function(fn,"changedDesc")
+                                                                                       .li(
+                                                                                               "dcb=document.getElementById('descCB');",
+                                                                                               "d=document.getElementById('descText');",
+                                                                                               "dcb.checked= (d.orig != d.value)"
+                                                                                       ).end(fn)
+                                                                                       .end(js);
+       
+                                                                               Mark mark = new Mark();
+                                                                               hgen.incr(mark,"form","method=post");
+                                                                               trans.put(sMark, mark);
+                                                                       }
                                                                }
                                                        } else {
                                                                trans.error().printf("Error calling AAF for Roles in GUI, Role Detail %d: %s",fr.code(),fr.body());
@@ -178,7 +182,7 @@ public class RoleDetail extends Page {
                public Cells get(final AuthzTrans trans, final AAF_GUI gui) {
                        final String pRole = trans.get(sRoleName, null);
                        final Role role = trans.get(sRole,null);
-                       ArrayList<AbsCell[]> rv = new ArrayList<AbsCell[]>();
+                       ArrayList<AbsCell[]> rv = new ArrayList<>();
                        
                        if(role!=null) {
                                boolean mayWrite = trans.get(sMayWrite, false);