RANGER-4533: updated REST API /public/v2/api/service-headers to exclu…

…de GDS service - #2
gympass · Dec 11, 2023 · 56f9d8c · 56f9d8c
1 parent a37a896
commit 56f9d8c
Showing 1 changed file with 9 additions and 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
@@ -1103,15 +1103,15 @@ public List<RangerServiceHeaderInfo> getServiceHeaders(@Context HttpServletReque
 
 		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();
 			}
 		}