Code Review
/
aaf
/
authz.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Adjust Agent for none K8s
[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
6733989
..
444a82a
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
@@
-48,7
+48,6
@@
public class List extends BaseCmd<User> {
void report(Users users, boolean count, String ... str) {
reportHead(str);
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, (Comparator<aaf.v2_0.Users.User>) (u1, u2) -> {
if (u1==null || u2 == null) {
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) {
@@
-56,16
+55,24
@@
public class List extends BaseCmd<User> {
}
return u1.getId().compareTo(u2.getId());
});
}
return u1.getId().compareTo(u2.getId());
});
- String format = reportColHead("%-
40s %-10s %-30s\n","User","Type","Expires
");
+ 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()) {
String date = "XXXX-XX-XX";
for (aaf.v2_0.Users.User user : sorted) {
if (!aafcli.isTest()) {
- date = Chrono.dateOnlyStamp(user.getExpires());
+ 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,
}
pw().format(format,
-
count? (Integer.valueOf(++idx) + ") " + user.getId()):
user.getId(),
+ user.getId(),
org.onap.aaf.auth.cmd.ns.List.getType(user),
org.onap.aaf.auth.cmd.ns.List.getType(user),
- date);
+ date,
+ tag);
}
pw().println();
}
}
pw().println();
}