From 3dcf92e9767581942501bd67a9c77aab0ae1cefd Mon Sep 17 00:00:00 2001 From: Arundathi Patil Date: Tue, 20 Nov 2018 16:55:19 +0530 Subject: Sonar Fix: List.java Fixed sonar issues/code-smells across this file. Issue-ID: AAF-638 Change-Id: I21ba82837ca09bab5efe3612d914de9c50f0bd08 Signed-off-by: Arundathi Patil --- .../main/java/org/onap/aaf/auth/cmd/ns/List.java | 25 +++++++++++----------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/ns/List.java b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/ns/List.java index 8fc79401..3dae0fa5 100644 --- a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/ns/List.java +++ b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/ns/List.java @@ -38,6 +38,11 @@ import aaf.v2_0.Users.User; public class List extends BaseCmd { + private static final String cformat = " %-30s %-6s %-24s\n"; + private static final String pformat = " %-30s %-24s %-15s\n"; + private static final String sformat = " %-72s\n"; + protected static final String kformat = " %-72s\n"; + public List(NS parent) { super(parent,"list"); cmds.add(new ListByName(this)); @@ -51,10 +56,6 @@ public class List extends BaseCmd { cmds.add(new ListChildren(this)); cmds.add(new ListNsKeysByAttrib(this)); } - - private static final String sformat = " %-72s\n"; - protected static final String kformat = " %-72s\n"; - public void report(Future fp, String ... str) { reportHead(str); @@ -69,19 +70,19 @@ public class List extends BaseCmd { pw().println(" Description"); pw().format(sformat,ns.getDescription()==null?"":ns.getDescription()); } - if (ns.getAdmin().size()>0) { + if (!(ns.getAdmin().isEmpty())) { pw().println(" Administrators"); for (String admin : ns.getAdmin()) { pw().format(sformat,admin); } } - if (ns.getResponsible().size()>0) { + if (!(ns.getResponsible().isEmpty())) { pw().println(" Owners (Responsible for Namespace)"); for (String responsible : ns.getResponsible()) { pw().format(sformat,responsible); } } - if (ns.getAttrib().size()>0) { + if (!(ns.getAttrib().isEmpty())) { pw().println(" Namespace Attributes"); for ( Ns.Attrib attr : ns.getAttrib()) { StringBuilder sb = new StringBuilder(attr.getKey()); @@ -118,7 +119,7 @@ public class List extends BaseCmd { } public void reportRole(Future fr) { - if (fr!=null && fr.value!=null && fr.value.getRole().size()>0) { + if (fr!=null && fr.value!=null && !(fr.value.getRole().isEmpty())) { pw().println(" Roles"); for (aaf.v2_0.Role r : fr.value.getRole()) { pw().format(sformat,r.getName()); @@ -126,9 +127,8 @@ public class List extends BaseCmd { } } - private static final String pformat = " %-30s %-24s %-15s\n"; public void reportPerm(Future fp) { - if (fp!=null && fp.value!=null && fp.value.getPerm().size()>0) { + if (fp!=null && fp.value!=null && !(fp.value.getPerm().isEmpty())) { pw().println(" Permissions"); for (aaf.v2_0.Perm p : fp.value.getPerm()) { pw().format(pformat,p.getType(),p.getInstance(),p.getAction()); @@ -136,10 +136,9 @@ public class List extends BaseCmd { } } - - private static final String cformat = " %-30s %-6s %-24s\n"; + public void reportCred(Future fc) { - if (fc!=null && fc.value!=null && fc.value.getUser().size()>0) { + if (fc!=null && fc.value!=null && !(fc.value.getUser().isEmpty())) { pw().println(" Credentials"); java.util.List users = fc.value.getUser(); Collections.sort(users, new Comparator() { -- cgit 1.2.3-korg