HWKALERTS-19 Fix for default ordering

hawkular · Jun 22, 2015 · 2a91097 · 2a91097
1 parent 4e06de7
commit 2a91097
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/...ar-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassAlertsServiceImpl.java b/...ar-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassAlertsServiceImpl.java
@@ -302,6 +302,14 @@ public Page<Alert> getAlerts(String tenantId, AlertsCriteria criteria, Pager pag
 
     private Page<Alert> preparePage(List<Alert> alerts, Pager pager) {
         if (pager != null)  {
+            if (pager.getOrder() != null
+                    && !pager.getOrder().isEmpty()
+                    && pager.getOrder().get(0).getField() == null) {
+                pager = Pager.builder()
+                        .withPageSize(pager.getPageSize())
+                        .withStartPage(pager.getPageNumber())
+                        .orderBy(Field.ALERT_ID.getText(), Order.Direction.DESCENDING).build();
+            }
             List<Alert> ordered = alerts;
             if (pager.getOrder() != null) {
                 pager.getOrder().stream().filter(o -> o.getField() != null && o.getDirection() != null)