X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-gui%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fgui%2Fpages%2FRolesShow.java;h=ffa8e3c2d18fd4599ea7f6a763d4078fdf93fd91;hb=4b5a7d721d994a49057e9bfb403c7bff1b376660;hp=e3f91ba3c79e748367f620810f1506674c9e5610;hpb=b126c6c5f625432722405538692184f5c74edaad;p=aaf%2Fauthz.git

diff --git a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/RolesShow.java b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/RolesShow.java
index e3f91ba3..ffa8e3c2 100644
--- a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/RolesShow.java
+++ b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/RolesShow.java
@@ -56,84 +56,85 @@ import aaf.v2_0.UserRoles;
  *
  */
 public class RolesShow extends Page {
-	public static final String HREF = "/gui/myroles";
-	private static final String DATE_TIME_FORMAT = "yyyy-MM-dd";
-	
-	public RolesShow(final AAF_GUI gui, final Page ... breadcrumbs) throws APIException, IOException {
-		super(gui.env, "MyRoles",HREF, NO_FIELDS,
-			new BreadCrumbs(breadcrumbs), 
-			new Table<AAF_GUI,AuthzTrans>("Roles",gui.env.newTransNoAvg(),new Model(), "class=std"));
-	}
+    public static final String HREF = "/gui/myroles";
+    private static final String DATE_TIME_FORMAT = "yyyy-MM-dd";
+    
+    public RolesShow(final AAF_GUI gui, final Page ... breadcrumbs) throws APIException, IOException {
+        super(gui.env, "MyRoles",HREF, NO_FIELDS,
+            new BreadCrumbs(breadcrumbs), 
+            new Table<AAF_GUI,AuthzTrans>("Roles",gui.env.newTransNoAvg(),new Model(), "class=std"));
+    }
 
-	/**
-	 * Implement the Table Content for Permissions by User
-	 * 
-	 * @author Jonathan
-	 *
-	 */
-	private static class Model extends TableData<AAF_GUI,AuthzTrans> {
-		private static final String[] headers = new String[] {"Role","Expires","Remediation","Actions"};
+    /**
+     * Implement the Table Content for Permissions by User
+     * 
+     * @author Jonathan
+     *
+     */
+    private static class Model extends TableData<AAF_GUI,AuthzTrans> {
+        private static final String[] headers = new String[] {"Role","Expires","Remediation","Actions"};
+        private static final String ROLE = "&role=";
+        private static final String USER = "?user=";
+        private static final String CLASS_EXPIRED = "class=expired";
 
-		@Override
-		public String[] headers() {
-			return headers;
-		}
-		
-		@Override
-		public Cells get(final AuthzTrans trans, final AAF_GUI gui) {
-			Cells rv = Cells.EMPTY;
+        @Override
+        public String[] headers() {
+            return headers;
+        }
+        
+        @Override
+        public Cells get(final AuthzTrans trans, final AAF_GUI gui) {
+            Cells rv = Cells.EMPTY;
 
-			try {
-				rv = gui.clientAsUser(trans.getUserPrincipal(), new Retryable<Cells>() {
-					@Override
-					public Cells code(Rcli<?> client) throws CadiException, ConnectException, APIException {
-						ArrayList<AbsCell[]> rv = new ArrayList<AbsCell[]>();
-						TimeTaken tt = trans.start("AAF Roles by User",Env.REMOTE);
-						try {
-							Future<UserRoles> fur = client.read("/authz/userRoles/user/"+trans.user(),gui.getDF(UserRoles.class));
-							if (fur.get(5000)) {
-								if(fur.value != null) for (UserRole u : fur.value.getUserRole()) {
-									if(u.getExpires().compare(Chrono.timeStamp()) < 0) {
-										AbsCell[] sa = new AbsCell[] {
-												new TextCell(u.getRole() + "*", "class=expired"),
-												new TextCell(new SimpleDateFormat(DATE_TIME_FORMAT).format(u.getExpires().toGregorianCalendar().getTime()),"class=expired"),
-												new RefCell("Extend",
-														UserRoleExtend.HREF + "?user="+trans.user()+"&role="+u.getRole(),
-														false,
-														new String[]{"class=expired"}),
-												new RefCell("Remove",
-													UserRoleRemove.HREF + "?user="+trans.user()+"&role="+u.getRole(),
-													false,
-													new String[]{"class=expired"})
-														
-											};
-											rv.add(sa);
-									} else {
-										AbsCell[] sa = new AbsCell[] {
-												new RefCell(u.getRole(),
-														RoleDetail.HREF+"?role="+u.getRole(),
-														false),
-												new TextCell(new SimpleDateFormat(DATE_TIME_FORMAT).format(u.getExpires().toGregorianCalendar().getTime())),
-												AbsCell.Null,
-												new RefCell("Remove",
-														UserRoleRemove.HREF + "?user="+trans.user()+"&role="+u.getRole(),
-														false)
-											};
-											rv.add(sa);
-									}
-								}
-							}
-							
-						} finally {
-							tt.done();
-						}
-						return new Cells(rv,null);
-					}
-				});
-			} catch (Exception e) {
-				trans.error().log(e);
-			}
-			return rv;
-		}
-	}
+            try {
+                rv = gui.clientAsUser(trans.getUserPrincipal(), new Retryable<Cells>() {
+                    @Override
+                    public Cells code(Rcli<?> client) throws CadiException, ConnectException, APIException {
+                        ArrayList<AbsCell[]> rv = new ArrayList<>();
+                        TimeTaken tt = trans.start("AAF Roles by User",Env.REMOTE);
+                        try {
+                            Future<UserRoles> fur = client.read("/authz/userRoles/user/"+trans.user(),gui.getDF(UserRoles.class));
+                            if (fur.get(5000) && fur.value != null) for (UserRole u : fur.value.getUserRole()) {
+                                    if(u.getExpires().compare(Chrono.timeStamp()) < 0) {
+                                        AbsCell[] sa = new AbsCell[] {
+                                                new TextCell(u.getRole() + "*", CLASS_EXPIRED),
+                                                new TextCell(new SimpleDateFormat(DATE_TIME_FORMAT).format(u.getExpires().toGregorianCalendar().getTime()),CLASS_EXPIRED),
+                                                new RefCell("Extend",
+                                                        UserRoleExtend.HREF+USER+trans.user()+ROLE+u.getRole(),
+                                                        false,
+                                                        new String[]{CLASS_EXPIRED}),
+                                                new RefCell("Remove",
+                                                    UserRoleRemove.HREF+USER +trans.user()+ROLE+u.getRole(),
+                                                    false,
+                                                    new String[]{CLASS_EXPIRED})
+                                                        
+                                            };
+                                            rv.add(sa);
+                                    } else {
+                                        AbsCell[] sa = new AbsCell[] {
+                                                new RefCell(u.getRole(),
+                                                        RoleDetail.HREF+"?role="+u.getRole(),
+                                                        false),
+                                                new TextCell(new SimpleDateFormat(DATE_TIME_FORMAT).format(u.getExpires().toGregorianCalendar().getTime())),
+                                                AbsCell.Null,
+                                                new RefCell("Remove",
+                                                        UserRoleRemove.HREF+USER+trans.user()+ROLE+u.getRole(),
+                                                        false)
+                                            };
+                                            rv.add(sa);
+                                    }
+                            }
+                            
+                        } finally {
+                            tt.done();
+                        }
+                        return new Cells(rv,null);
+                    }
+                });
+            } catch (Exception e) {
+                trans.error().log(e);
+            }
+            return rv;
+        }
+    }
 }