RANGER-3500: updated policy retrieval to support sortBy and sortOrder

Signed-off-by: Madhan Neethiraj <[email protected]>
(cherry picked from commit 62cbf40)

Author: yangxuze

agents-common/src/main/java/org/apache/ranger/plugin/store/AbstractPredicateUtil.java

@@ -60,8 +60,10 @@ public void applyFilter(List<? extends RangerBaseModelObject> objList, SearchFil
 
 		Comparator<RangerBaseModelObject> sorter = getSorter(filter);
 
-		if(sorter != null) {
-			Collections.sort(objList, sorter);
+		if (sorter != null) {
+			boolean isDesc = "desc".equalsIgnoreCase(filter.getSortType());
+
+			Collections.sort(objList, isDesc ? new ReverseComparator(sorter) : sorter);
 		}
 	}
 
@@ -232,7 +234,6 @@ public int compare(RangerBaseModelObject o1, RangerBaseModelObject o2) {
 		sorterMap.put(SearchFilter.SERVICE_TYPE, serviceDefNameComparator);
 		sorterMap.put(SearchFilter.SERVICE_TYPE_ID, idComparator);
 		sorterMap.put(SearchFilter.SERVICE_NAME, serviceNameComparator);
-		sorterMap.put(SearchFilter.SERVICE_TYPE_ID, idComparator);
 		sorterMap.put(SearchFilter.POLICY_NAME, policyNameComparator);
 		sorterMap.put(SearchFilter.POLICY_ID, idComparator);
 		sorterMap.put(SearchFilter.CREATE_TIME, createTimeComparator);
@@ -1050,4 +1051,17 @@ public boolean evaluate(Object object) {
 
         return ret;
     }
+
+	private static class ReverseComparator implements Comparator<RangerBaseModelObject> {
+		private final Comparator<RangerBaseModelObject> comparator;
+
+		ReverseComparator(Comparator<RangerBaseModelObject> comparator) {
+			this.comparator = comparator;
+		}
+
+		@Override
+		public int compare(RangerBaseModelObject o1, RangerBaseModelObject o2) {
+			return comparator.compare(o2, o1);
+		}
+	}
 }

agents-common/src/main/java/org/apache/ranger/plugin/util/SearchFilter.java

@@ -103,7 +103,20 @@ public class SearchFilter {
 	private String              sortType;
 
 	public SearchFilter() {
-		this(null);
+		this((Map<String, String>) null);
+	}
+
+	public SearchFilter(SearchFilter other) {
+		if (other != null) {
+			setParams(other.params != null ? new HashMap<>(other.params) : null);
+			setStartIndex(other.startIndex);
+			setMaxRows(other.maxRows);
+			setGetCount(other.getCount);
+			setSortBy(other.sortBy);
+			setSortType(other.sortType);
+		} else {
+			setParams(null);
+		}
 	}
 
 	public SearchFilter(String name, String value) {

security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java

@@ -2588,13 +2588,10 @@ private List<RangerPolicy> getServicePolicies(XXService service, SearchFilter fi
 		final List<RangerPolicy> policies = servicePolicies != null ? servicePolicies.getPolicies() : null;
 
 		if(policies != null && filter != null && MapUtils.isNotEmpty(filter.getParams())) {
-			Map<String, String> filterResources = filter.getParamsWithPrefix(SearchFilter.RESOURCE_PREFIX, true);
-			String resourceMatchScope = filter.getParam(SearchFilter.RESOURCE_MATCH_SCOPE);
-
-			boolean useLegacyResourceSearch = true;
-
-			Map<String, String> paramsCopy  = new HashMap<>(filter.getParams());
-			SearchFilter       searchFilter = new SearchFilter(paramsCopy);
+			Map<String, String> filterResources         = filter.getParamsWithPrefix(SearchFilter.RESOURCE_PREFIX, true);
+			String              resourceMatchScope      = filter.getParam(SearchFilter.RESOURCE_MATCH_SCOPE);
+			boolean             useLegacyResourceSearch = true;
+			SearchFilter        searchFilter            = new SearchFilter(filter);
 
 			if (MapUtils.isNotEmpty(filterResources) && resourceMatchScope != null) {
 				useLegacyResourceSearch = false;