Sonar Fixes, Formatting
[aaf/authz.git] / auth / auth-service / src / main / java / org / onap / aaf / auth / service / api / API_User.java
index 0ce1dfe..526766e 100644 (file)
@@ -7,9 +7,9 @@
  * 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.
@@ -24,6 +24,8 @@ package org.onap.aaf.auth.service.api;
 import static org.onap.aaf.auth.layer.Result.OK;
 import static org.onap.aaf.auth.rserv.HttpMethods.GET;
 
+import java.net.URLDecoder;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -34,6 +36,7 @@ import org.onap.aaf.auth.service.AAF_Service;
 import org.onap.aaf.auth.service.Code;
 import org.onap.aaf.auth.service.facade.AuthzFacade;
 import org.onap.aaf.auth.service.mapper.Mapper.API;
+import org.onap.aaf.cadi.config.Config;
 
 /**
  * User Role APIs
@@ -43,7 +46,7 @@ import org.onap.aaf.auth.service.mapper.Mapper.API;
 public class API_User {
     /**
      * Normal Init level APIs
-     * 
+     *
      * @param authzAPI
      * @param facade
      * @throws Exception
@@ -55,17 +58,17 @@ public class API_User {
         authzAPI.route(GET,"/authz/users/perm/:type/:instance/:action",API.USERS,new Code(facade,"Get Users By Permission", true) {
             @Override
             public void handle(AuthzTrans trans, HttpServletRequest req, HttpServletResponse resp) throws Exception {
-//                trans.checkpoint(pathParam(req,"type") + " " 
-//                        + pathParam(req,"instance") + " " 
+//                trans.checkpoint(pathParam(req,"type") + " "
+//                        + pathParam(req,"instance") + " "
 //                        + pathParam(req,"action"));
 //
                 Result<Void> r = context.getUsersByPermission(trans, resp,
                         pathParam(req, ":type"),
-                        pathParam(req, ":instance"),
+                        URLDecoder.decode(pathParam(req, ":instance"),Config.UTF_8),
                         pathParam(req, ":action"));
                 switch(r.status) {
                     case OK:
-                        resp.setStatus(HttpStatus.OK_200); 
+                        resp.setStatus(HttpStatus.OK_200);
                         break;
                     default:
                         context.error(trans,resp,r);
@@ -83,14 +86,14 @@ public class API_User {
                 Result<Void> r = context.getUsersByRole(trans, resp, pathParam(req, ":role"));
                 switch(r.status) {
                     case OK:
-                        resp.setStatus(HttpStatus.OK_200); 
+                        resp.setStatus(HttpStatus.OK_200);
                         break;
                     default:
                         context.error(trans,resp,r);
                 }
             }
         });
-        
+
         /**
          * Get User Role if exists
          * @deprecated
@@ -101,7 +104,7 @@ public class API_User {
                 Result<Void> r = context.getUserInRole(trans, resp, pathParam(req,":user"),pathParam(req,":role"));
                 switch(r.status) {
                     case OK:
-                        resp.setStatus(HttpStatus.OK_200); 
+                        resp.setStatus(HttpStatus.OK_200);
                         break;
                     default:
                         context.error(trans,resp,r);
@@ -118,16 +121,16 @@ public class API_User {
                 Result<Void> r = context.getUserInRole(trans, resp, pathParam(req,":user"),pathParam(req,":role"));
                 switch(r.status) {
                     case OK:
-                        resp.setStatus(HttpStatus.OK_200); 
+                        resp.setStatus(HttpStatus.OK_200);
                         break;
                     default:
                         context.error(trans,resp,r);
                 }
             }
         });
-        
+
 
 
     }
-        
+
 }