[ranger] branch master updated: RANGER-2613: Public API for listing roles needs to return a Java list of RangerRole objects

[abhay]

This is an automated email from the ASF dual-hosted git repository.

abhay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ranger.git


The following commit(s) were added to refs/heads/master by this push:
     new 72be01b  RANGER-2613: Public API for listing roles needs to return a 
Java list of RangerRole objects
72be01b is described below

commit 72be01bb789e369158d73a841800b22f71a5c85a
Author: Abhay Kulkarni <ab...@apache.org>
AuthorDate: Wed Oct 9 16:29:39 2019 -0700

    RANGER-2613: Public API for listing roles needs to return a Java list of 
RangerRole objects
---
 .../main/java/org/apache/ranger/rest/PublicAPIsv2.java    | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git 
a/security-admin/src/main/java/org/apache/ranger/rest/PublicAPIsv2.java 
b/security-admin/src/main/java/org/apache/ranger/rest/PublicAPIsv2.java
index f329d17..1a83949 100644
--- a/security-admin/src/main/java/org/apache/ranger/rest/PublicAPIsv2.java
+++ b/security-admin/src/main/java/org/apache/ranger/rest/PublicAPIsv2.java
@@ -32,9 +32,6 @@ import org.apache.ranger.plugin.model.RangerService;
 import org.apache.ranger.plugin.model.RangerServiceDef;
 import org.apache.ranger.plugin.util.GrantRevokeRoleRequest;
 import org.apache.ranger.plugin.util.SearchFilter;
-import org.apache.ranger.view.RangerPluginInfoList;
-import org.apache.ranger.view.RangerRoleList;
-import org.apache.ranger.view.RangerSecurityZoneList;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -120,8 +117,8 @@ public class PublicAPIsv2 {
 
        @GET
     @Path("/api/zones")
-    public RangerSecurityZoneList getAllZones(@Context HttpServletRequest 
request){
-               return securityZoneRest.getAllZones(request);
+    public List<RangerSecurityZone> getAllZones(@Context HttpServletRequest 
request){
+               return securityZoneRest.getAllZones(request).getSecurityZones();
        }
 
        /*
@@ -519,12 +516,12 @@ public class PublicAPIsv2 {
                        logger.debug("==> PublicAPIsv2.getPluginsInfo()");
                }
 
-               RangerPluginInfoList pluginInfoList = 
serviceREST.getPluginsInfo(request);
+               List<RangerPluginInfo> ret = 
serviceREST.getPluginsInfo(request).getPluginInfoList();
 
                if (logger.isDebugEnabled()) {
                        logger.debug("<== PublicAPIsv2.getPluginsInfo()");
                }
-               return pluginInfoList.getPluginInfoList();
+               return ret;
        }
 
        @DELETE
@@ -614,8 +611,8 @@ public class PublicAPIsv2 {
        @GET
        @Path("/api/roles")
        @Produces({ "application/json", "application/xml" })
-       public RangerRoleList getAllRoles(@Context HttpServletRequest request){
-               return roleREST.getAllRoles(request);
+       public List<RangerRole> getAllRoles(@Context HttpServletRequest 
request) {
+               return roleREST.getAllRoles(request).getSecurityRoles();
        }
 
        @GET