Agent correctly sort Cert Chain/Truststore

[aaf/authz.git] / auth / auth-cmd / src / main / java / org / onap / aaf / auth / cmd / user / List.java

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 3074ab8..7daa51f 100644 (file)
--- 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
@@ -50,25 +50,30 @@ public class List extends BaseCmd<User> {
         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 (u1==null || u2 == null) {
-                    return -1;
-                }
-                return u1.getId().compareTo(u2.getId());
+        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("%-40s %-10s %-30s\n","User","Type","Expires");
+        String format = reportColHead("%-48s %-5s %-11s %-16s\n","User","Type","Expires","Tag");
         String date = "XXXX-XX-XX";
         for (aaf.v2_0.Users.User user : sorted) {
             if (!aafcli.isTest()) {
                 date = Chrono.dateOnlyStamp(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, 
                     count? (Integer.valueOf(++idx) + ") " + user.getId()): user.getId(),
                     org.onap.aaf.auth.cmd.ns.List.getType(user),
-                    date);
+                    date,
+                    tag);
         }
         pw().println();
     }
@@ -77,13 +82,9 @@ public class List extends BaseCmd<User> {
         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;
+        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)) {