[ranger] branch master updated: RANGER-2357 : Improvement on getServices API

[mehul]

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

mehul 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 b3cb224  RANGER-2357 : Improvement on getServices API
b3cb224 is described below

commit b3cb2248aba52af7c6bf977dfe921ca329265f12
Author: Nikhil P <nikhil.pur...@gmail.com>
AuthorDate: Tue Mar 12 18:18:56 2019 +0530

    RANGER-2357 : Improvement on getServices API
    
    Signed-off-by: Mehul Parikh <me...@apache.org>
---
 .../src/main/java/org/apache/ranger/common/RangerSearchUtil.java      | 2 +-
 .../main/java/org/apache/ranger/service/RangerServiceServiceBase.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/security-admin/src/main/java/org/apache/ranger/common/RangerSearchUtil.java 
b/security-admin/src/main/java/org/apache/ranger/common/RangerSearchUtil.java
index ad38417..947b230 100644
--- 
a/security-admin/src/main/java/org/apache/ranger/common/RangerSearchUtil.java
+++ 
b/security-admin/src/main/java/org/apache/ranger/common/RangerSearchUtil.java
@@ -72,7 +72,7 @@ public class RangerSearchUtil extends SearchUtil {
                ret.setParam(SearchFilter.PLUGIN_ENTITY_TYPE, 
request.getParameter(SearchFilter.PLUGIN_ENTITY_TYPE));
                ret.setParam(SearchFilter.PLUGIN_IP_ADDRESS, 
request.getParameter(SearchFilter.PLUGIN_IP_ADDRESS));
                ret.setParam(SearchFilter.ZONE_NAME, 
request.getParameter(SearchFilter.ZONE_NAME));
-
+               ret.setParam(SearchFilter.TAG_SERVICE_ID, 
request.getParameter(SearchFilter.TAG_SERVICE_ID));
                for (Map.Entry<String, String[]> e : 
request.getParameterMap().entrySet()) {
                        String name = e.getKey();
                        String[] values = e.getValue();
diff --git 
a/security-admin/src/main/java/org/apache/ranger/service/RangerServiceServiceBase.java
 
b/security-admin/src/main/java/org/apache/ranger/service/RangerServiceServiceBase.java
index 315946e..7db67ac 100755
--- 
a/security-admin/src/main/java/org/apache/ranger/service/RangerServiceServiceBase.java
+++ 
b/security-admin/src/main/java/org/apache/ranger/service/RangerServiceServiceBase.java
@@ -52,9 +52,9 @@ public abstract class RangerServiceServiceBase<T extends 
XXServiceBase, V extend
                searchFields.add(new 
SearchField(SearchFilter.SERVICE_NAME_PARTIAL, "obj.name", DATA_TYPE.STRING, 
SEARCH_TYPE.PARTIAL));
                searchFields.add(new SearchField(SearchFilter.SERVICE_ID, 
"obj.id", DATA_TYPE.INTEGER, SEARCH_TYPE.FULL));
                searchFields.add(new SearchField(SearchFilter.IS_ENABLED, 
"obj.isEnabled", DATA_TYPE.BOOLEAN, SEARCH_TYPE.FULL));
-               searchFields.add(new SearchField(SearchFilter.TAG_SERVICE_ID, 
"obj.tag_service", DATA_TYPE.INTEGER, SEARCH_TYPE.FULL));
+               searchFields.add(new SearchField(SearchFilter.TAG_SERVICE_ID, 
"obj.tagService", DATA_TYPE.INTEGER, SEARCH_TYPE.FULL));
                searchFields.add(new SearchField(SearchFilter.TAG_SERVICE_NAME, 
"xTagSvc.name", DATA_TYPE.STRING,
-                               SEARCH_TYPE.FULL, "XXServiceBase xTagSvc", 
"obj.tag_service = xTagSvc.id"));
+                               SEARCH_TYPE.FULL, "XXServiceBase xTagSvc", 
"obj.tagService = xTagSvc.id"));
                
                sortFields.add(new SortField(SearchFilter.CREATE_TIME, 
"obj.createTime"));
                sortFields.add(new SortField(SearchFilter.UPDATE_TIME, 
"obj.updateTime"));