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

diff --git a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/role/List.java b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/role/List.java
index 2f84f583..2e3d1757 100644
--- a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/role/List.java
+++ b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/role/List.java
@@ -3,13 +3,15 @@
  * org.onap.aaf
  * ===========================================================================
  * Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
+ *
+ * Modification Copyright (c) 2019 IBM
  * ===========================================================================
  * 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.
@@ -57,7 +59,7 @@ public class List extends BaseCmd<Role> {
         cmds.add(new ListByPerm(this));
         cmds.add(new ListActivity(this));
     }
-    
+
     // Package Level on purpose
     abstract class ListRoles extends Retryable<Integer> {
         protected int list(Future<Roles> fr,Rcli<?> client, String header) throws APIException, CadiException {
@@ -66,7 +68,7 @@ public class List extends BaseCmd<Role> {
                 if (aafcli.isDetailed()) {
                     for (aaf.v2_0.Role r : fr.value.getRole()) {
                         Future<Perms> fp = client.read(
-                                "/authz/perms/role/"+r.getName()+(aafcli.isDetailed()?"?ns":""), 
+                                "/authz/perms/role/"+r.getName()+(aafcli.isDetailed()?"?ns":""),
                                 getDF(Perms.class)
                             );
                         if (fp.get(AAFcli.timeout())) {
@@ -86,12 +88,12 @@ public class List extends BaseCmd<Role> {
         }
     }
 
-    private final static String roleFormat = "%-56s Expires %s\n";
-    private final static String roleFormatNoDate = "%-61s\n";
-    private final static String roleExpiredFormat = "%-53s !!! EXPIRED !!! %s\n";
-    private final static String permFormat = "   %-30s %-30s %-15s\n";
+    private static final String roleFormat = "%-56s Expires %s\n";
+    private static final String roleFormatNoDate = "%-61s\n";
+    private static final String roleExpiredFormat = "%-53s !!! EXPIRED !!! %s\n";
+    private static final String permFormat = "   %-30s %-30s %-15s\n";
+
 
-    
     private static final Comparator<aaf.v2_0.Role> roleCompare = new Comparator<aaf.v2_0.Role>() {
         @Override
         public int compare(aaf.v2_0.Role a, aaf.v2_0.Role b) {
@@ -106,9 +108,11 @@ public class List extends BaseCmd<Role> {
         } else if (aafcli.isDetailed()){
             if (str[0].toLowerCase().contains(LIST_ROLES_BY_NAME)) {
                 String description = roles.getRole().get(0).getDescription();
-                if (description == null) description = "";
+                if (description == null) {
+                    description = "";
+                }
                 reportColHead("%-80s\n","Description: " + description);
-            }             
+            }
 
             String fullFormat = roleFormat+permFormat;
             reportColHead(fullFormat,"[ROLE NS].Name","","[PERM NS].Type","Instance","Action");
@@ -123,12 +127,12 @@ public class List extends BaseCmd<Role> {
                         pw().format(roleFormat, "["+ns+"]"+roleName.substring(ns.length()),XXXX_XX_XX);
                     }
                 } else {
-                	String fullname;
-                	if(ns==null) {
-                		fullname = roleName;
-                	} else {
-                		fullname = ns+'.'+roleName;
-                	}
+                    String fullname;
+                    if(ns==null) {
+                        fullname = roleName;
+                    } else {
+                        fullname = ns+'.'+roleName;
+                    }
                     UserRole ur = get(fullname,urs);
                     if (ur!=null && now.compare(ur.getExpires().normalize())>0) {
                         if (ns==null) {
@@ -148,13 +152,13 @@ public class List extends BaseCmd<Role> {
                 for (Pkey pkey : r.getPerms()) {
                     Perm perm = get(pkey,perms);
                     if (perm==null || perm.getNs()==null) {
-                        pw().format(permFormat, 
+                        pw().format(permFormat,
                                 pkey.getType(),
                                 pkey.getInstance(),
                                 pkey.getAction());
                     } else {
                         String ns1 = perm.getNs();
-                        pw().format(permFormat, 
+                        pw().format(permFormat,
                                 '['+ns1+"]"+perm.getType().substring(ns1.length()),
                                 perm.getInstance(),
                                 perm.getAction());
@@ -181,7 +185,7 @@ public class List extends BaseCmd<Role> {
                 } else {
                     pw().format(roleFormatNoDate, r.getName());
                     for (Pkey perm : r.getPerms()) {
-                        pw().format(permFormat, 
+                        pw().format(permFormat,
                                 perm.getType(),
                                 perm.getInstance(),
                                 perm.getAction());