Merge "AAFcli.java -Declare "value" on a separate line"

[aaf/authz.git] / auth / auth-cmd / src / main / java / org / onap / aaf / auth / cmd / role / ListByPerm.java

diff --git a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/role/ListByPerm.java b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/role/ListByPerm.java
index cb18eb3..3d3e5e4 100644 (file)
--- a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/role/ListByPerm.java
+++ b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/role/ListByPerm.java
@@ -3,13 +3,14 @@
  * org.onap.aaf
  * ===========================================================================
  * Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2018 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.
@@ -21,6 +22,9 @@
 
 package org.onap.aaf.auth.cmd.role;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+
 import org.onap.aaf.auth.cmd.Cmd;
 import org.onap.aaf.auth.cmd.Param;
 import org.onap.aaf.auth.rserv.HttpMethods;
@@ -28,51 +32,57 @@ import org.onap.aaf.cadi.CadiException;
 import org.onap.aaf.cadi.LocatorException;
 import org.onap.aaf.cadi.client.Future;
 import org.onap.aaf.cadi.client.Rcli;
+import org.onap.aaf.cadi.config.Config;
 import org.onap.aaf.misc.env.APIException;
 
 import aaf.v2_0.Roles;
 
 /**
  * Return Roles by NS
- * 
+ *
  * @author Jonathan
  *
  */
 public class ListByPerm extends Cmd {
-       private static final String HEADER = "List Roles by Perm ";
-       
-       public ListByPerm(List parent) {
-               super(parent,"perm", 
-                               new Param("type",true),
-                               new Param("instance", true),
-                               new Param("action", true)); 
-       }
+    private static final String HEADER = "List Roles by Perm ";
+
+    public ListByPerm(List parent) {
+        super(parent,"perm",
+                new Param("type",true),
+                new Param("instance", true),
+                new Param("action", true));
+    }
 
-       @Override
-       public int _exec(int _idx, final String ... args) throws CadiException, APIException, LocatorException {
-               int idx = _idx;
-               final String type=args[idx];
-               final String instance=args[++idx];
-               final String action=args[++idx];
+    @Override
+    public int _exec(int idx0, final String ... args) throws CadiException, APIException, LocatorException {
+        int idx = idx0;
+        final String type=args[idx];
+        final String instance=args[++idx];
+        final String action = args[++idx];
 
-               return same(((List)parent).new ListRoles() {
-                       @Override
-                       public Integer code(Rcli<?> client) throws CadiException, APIException {
+        return same(((List)parent).new ListRoles() {
+            @Override
+            public Integer code(Rcli<?> client) throws CadiException, APIException {
+                try {
+                    Future<Roles> fp = client.read(
+                            "/authz/roles/perm/"+type+'/' +
+                                URLEncoder.encode(instance,Config.UTF_8)+'/'+
+                                action,
+                            getDF(Roles.class)
+                            );
+                    return list(fp,client, HEADER+type+'|'+instance+'|'+action);
+                } catch (UnsupportedEncodingException e) {
+                    throw new CadiException(e);
+                }
+            }
+        });
+    }
 
-                               Future<Roles> fp = client.read(
-                                               "/authz/roles/perm/"+type+'/'+instance+'/'+action, 
-                                               getDF(Roles.class)
-                                               );
-                               return list(fp,client, HEADER+type+'|'+instance+'|'+action);
-                       }
-               });
-       }
-       
-       @Override
-       public void detailedHelp(int indent, StringBuilder sb) {
-               detailLine(sb,indent,HEADER);
-               api(sb,indent,HttpMethods.GET,"authz/roles/user/<user>",Roles.class,true);
-       }
+    @Override
+    public void detailedHelp(int indent, StringBuilder sb) {
+        detailLine(sb,indent,HEADER);
+        api(sb,indent,HttpMethods.GET,"authz/roles/user/<user>",Roles.class,true);
+    }
 
 
 }