JAMES-1894 Let backend care about sorting by default

apache · Jan 9, 2017 · 0606d2e · 0606d2e
1 parent f6bc8be
commit 0606d2e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/GetMessageListMethod.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/GetMessageListMethod.java
@@ -118,7 +118,10 @@ private MultimailboxesSearchQuery convertToSearchQuery(GetMessageListRequest mes
                 .orElse(new SearchQuery());
         Set<MailboxId> inMailboxes = buildFilterMailboxesSet(messageListRequest.getFilter(), FilterCondition::getInMailboxes);
         Set<MailboxId> notInMailboxes = buildFilterMailboxesSet(messageListRequest.getFilter(), FilterCondition::getNotInMailboxes);
-        searchQuery.setSorts(SortConverter.convertToSorts(messageListRequest.getSort()));
+        List<SearchQuery.Sort> sorts = SortConverter.convertToSorts(messageListRequest.getSort());
+        if (!sorts.isEmpty()) {
+            searchQuery.setSorts(sorts);
+        }
         return MultimailboxesSearchQuery
                 .from(searchQuery)
                 .inMailboxes(inMailboxes)

diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/utils/SortConverter.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/utils/SortConverter.java
@@ -38,19 +38,13 @@ public class SortConverter {
     private static final Map<String, SearchQuery.Sort.SortClause> SORT_CLAUSE_MAP = ImmutableMap.of(
         "date", SearchQuery.Sort.SortClause.Arrival,
         "id", SearchQuery.Sort.SortClause.Id);
-    public static final boolean REVERSE = true;
-    public static final SearchQuery.Sort DEFAULT_SORT = new SearchQuery.Sort(SearchQuery.Sort.SortClause.Arrival, REVERSE);
 
 
     public static List<SearchQuery.Sort> convertToSorts(List<String> jmapSorts) {
         Preconditions.checkNotNull(jmapSorts);
-        ImmutableList<SearchQuery.Sort> result = jmapSorts.stream()
+        return jmapSorts.stream()
             .map(SortConverter::toSort)
             .collect(Guavate.toImmutableList());
-        if (result.isEmpty()) {
-            return ImmutableList.of(DEFAULT_SORT);
-        }
-        return result;
     }
 
     private static SearchQuery.Sort toSort(String jmapSort) {

diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/SortConverterTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/SortConverterTest.java
@@ -45,9 +45,9 @@ public void convertToSortsShouldThrowOnNullValue() {
     }
 
     @Test
-    public void convertToSortsShouldReturnDefaultSortOnEmptyEntry() {
+    public void convertToSortsShouldReturnEmptyOnEmptyEntry() {
         assertThat(SortConverter.convertToSorts(ImmutableList.of()))
-            .containsOnly(new SearchQuery.Sort(SearchQuery.Sort.SortClause.Arrival, REVERSE));
+            .isEmpty();
     }
 
     @Test