(ranger) branch RANGER-3923 updated: RANGER-4533: updated REST API /public/v2/api/service-headers to exclude GDS service - #2

[madhan]

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

madhan pushed a commit to branch RANGER-3923
in repository https://gitbox.apache.org/repos/asf/ranger.git


The following commit(s) were added to refs/heads/RANGER-3923 by this push:
     new 56f9d8c08 RANGER-4533: updated REST API /public/v2/api/service-headers 
to exclude GDS service - #2
56f9d8c08 is described below

commit 56f9d8c085a0b395afd9cfcb6054f23f608e3802
Author: Madhan Neethiraj <mad...@apache.org>
AuthorDate: Mon Dec 11 09:46:47 2023 -0800

    RANGER-4533: updated REST API /public/v2/api/service-headers to exclude GDS 
service - #2
---
 .../main/java/org/apache/ranger/rest/ServiceREST.java  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git 
a/security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java 
b/security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java
index 0a5048162..dcad9f231 100644
--- a/security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java
+++ b/security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java
@@ -1103,15 +1103,15 @@ public class ServiceREST {
 
                List<RangerServiceHeaderInfo> ret = 
daoManager.getXXService().findServiceHeaders();
 
-               if (!ret.isEmpty() && (filterByNamePrefix || filterByType)) {
-                       for (ListIterator<RangerServiceHeaderInfo> iter = 
ret.listIterator(); iter.hasNext(); ) {
-                               RangerServiceHeaderInfo serviceHeader = 
iter.next();
-
-                               if (filterByNamePrefix && 
!StringUtils.startsWithIgnoreCase(serviceHeader.getName(), namePrefix)) {
-                                       iter.remove();
-                               } else if (filterByType && 
!StringUtils.equals(serviceHeader.getType(), svcType)) {
-                                       iter.remove();
-                               }
+               for (ListIterator<RangerServiceHeaderInfo> iter = 
ret.listIterator(); iter.hasNext(); ) {
+                       RangerServiceHeaderInfo serviceHeader = iter.next();
+
+                       if 
(EMBEDDED_SERVICEDEF_GDS_NAME.equals(serviceHeader.getType())) {
+                               iter.remove();
+                       } else if (filterByNamePrefix && 
!StringUtils.startsWithIgnoreCase(serviceHeader.getName(), namePrefix)) {
+                               iter.remove();
+                       } else if (filterByType && 
!StringUtils.equals(serviceHeader.getType(), svcType)) {
+                               iter.remove();
                        }
                }