X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-cmd%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fcmd%2Fuser%2FList.java;h=b30113692844e8e5e5a4d93268da144eacbcbc3e;hb=1296352d8eafee57f982a4342ad79ada4aa56d28;hp=5c87f9065310667abb53a764cd5f578ab0db931f;hpb=71037c39a37d3549dcfe31926832a657744fbe05;p=aaf%2Fauthz.git

diff --git a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/user/List.java b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/user/List.java
index 5c87f906..b3011369 100644
--- a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/user/List.java
+++ b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/user/List.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -35,87 +35,87 @@ import aaf.v2_0.Users;
 
 public class List extends BaseCmd<User> {
 
-	public List(User parent) {
-		super(parent,"list");
-		cmds.add(new ListForRoles(this));
-		cmds.add(new ListForPermission(this));
-		cmds.add(new ListForCreds(this));
-		cmds.add(new ListDelegates(this));
-		cmds.add(new ListApprovals(this));
-		cmds.add(new ListActivity(this));
-	}
+    public List(User parent) {
+        super(parent,"list");
+        cmds.add(new ListForRoles(this));
+        cmds.add(new ListForPermission(this));
+        cmds.add(new ListForCreds(this));
+        cmds.add(new ListDelegates(this));
+        cmds.add(new ListApprovals(this));
+        cmds.add(new ListActivity(this));
+    }
+
 
-	 
-	void report(Users users, boolean count, String ... str) {
-		reportHead(str);
-		int idx = 0;
-		java.util.List<aaf.v2_0.Users.User> sorted = users.getUser();
-		Collections.sort(sorted, new Comparator<aaf.v2_0.Users.User>() {
-			@Override
-			public int compare(aaf.v2_0.Users.User u1, aaf.v2_0.Users.User u2) {
-				if(u2==null || u2 == null) {
-					return -1;
-				}
-				return u1.getId().compareTo(u2.getId());
-			}
-		});
-		String format = reportColHead("%-40s %-10s %-30s\n","User","Type","Expires");
-		String date = "XXXX-XX-XX";
-		for(aaf.v2_0.Users.User user : sorted) {
-			if(!aafcli.isTest()) {
-				date = Chrono.dateOnlyStamp(user.getExpires());
-			}
-			pw().format(format, 
-					count? (Integer.valueOf(++idx) + ") " + user.getId()): user.getId(),
-					org.onap.aaf.auth.cmd.ns.List.getType(user),
-					date);
-		}
-		pw().println();
-	}
+    void report(Users users, boolean count, String ... str) {
+        reportHead(str);
+        java.util.List<aaf.v2_0.Users.User> sorted = users.getUser();
+        Collections.sort(sorted, (Comparator<aaf.v2_0.Users.User>) (u1, u2) -> {
+            if (u1==null || u2 == null) {
+                return -1;
+            }
+            return u1.getId().compareTo(u2.getId());
+        });
+        String format = reportColHead("%-36s %-5s %-20s %-16s\n","User","Type","Expires","Tag");
+        String date = "XXXX-XX-XX";
+        for (aaf.v2_0.Users.User user : sorted) {
+            if (!aafcli.isTest()) {
+                date = Chrono.niceUTCStamp(user.getExpires());
+            }
+            String tag=user.getTag();
+            Integer type = user.getType();
+            if(tag==null) {
+                tag="";
+            } else if(type!=null && type>=200) {
+                tag = "\n\tfingerprint: " + tag;
+            }
+            pw().format(format,
+                    user.getId(),
+                    org.onap.aaf.auth.cmd.ns.List.getType(user),
+                    date,
+                    tag);
+        }
+        pw().println();
+    }
 
-	public void report(Approvals approvals, String title, String id) {
-		reportHead(title,id);
-		String format = reportColHead("  %-20s %-20s %-11s %-6s %12s\n","User","Approver","Type","Status","Updated");
-		java.util.List<Approval> lapp = approvals.getApprovals();
-		Collections.sort(lapp, new Comparator<Approval>() {
-			@Override
-			public int compare(Approval a1, Approval a2) {
-				return a1.getTicket().compareTo(a2.getTicket());
-			}
-		} );
-		String ticket = null, prev = null;
-		for(Approval app : lapp ) {
-			ticket = app.getTicket();
-			if(!ticket.equals(prev)) {
-				pw().print("Ticket: ");
-				pw().println(ticket);
-			}
-			prev = ticket;
+    public void report(Approvals approvals, String title, String id) {
+        reportHead(title,id);
+        String format = reportColHead("  %-20s %-20s %-11s %-6s %12s\n","User","Approver","Type","Status","Updated");
+        java.util.List<Approval> lapp = approvals.getApprovals();
+        Collections.sort(lapp, (Comparator<Approval>) (a1, a2) -> a1.getTicket().compareTo(a2.getTicket()));
+        String ticket = null;
+        String prev = null;
+        for (Approval app : lapp ) {
+            ticket = app.getTicket();
+            if (!ticket.equals(prev)) {
+                pw().print("Ticket: ");
+                pw().println(ticket);
+            }
+            prev = ticket;
 
-			pw().format(format,
-					app.getUser(),
-					app.getApprover(),
-					app.getType(),
-					app.getStatus(),
-					Chrono.niceDateStamp(app.getUpdated())
-					);
-		}
-	}
+            pw().format(format,
+                    app.getUser(),
+                    app.getApprover(),
+                    app.getType(),
+                    app.getStatus(),
+                    Chrono.niceDateStamp(app.getUpdated())
+                    );
+        }
+    }
 
-	public void report(Delgs delgs, String title, String id) {
-		reportHead(title,id);
-		String format = reportColHead(" %-25s %-25s  %-10s\n","User","Delegate","Expires");
-		String date = "XXXX-XX-XX";
-		for(Delg delg : delgs.getDelgs()) {
-			if(!this.aafcli.isTest()) 
-				date = Chrono.dateOnlyStamp(delg.getExpires());
-			pw().printf(format, 
-						delg.getUser(),
-						delg.getDelegate(),
-						date
-						);
-		}
-	}
+    public void report(Delgs delgs, String title, String id) {
+        reportHead(title,id);
+        String format = reportColHead(" %-25s %-25s  %-10s\n","User","Delegate","Expires");
+        String date = "XXXX-XX-XX";
+        for (Delg delg : delgs.getDelgs()) {
+            if (!this.aafcli.isTest())
+                date = Chrono.dateOnlyStamp(delg.getExpires());
+            pw().printf(format,
+                        delg.getUser(),
+                        delg.getDelegate(),
+                        date
+                        );
+        }
+    }
 
 
 }