server: fix sortBy and sortOrder

The commit fixes an issue when respecting `sortBy` and `sortOder`.
The proper ordering provided by the search-hits were not respected when
collecting them after being streamed.

Signed-off-by: vince-fugnitto <vincent.fugnitto@ericsson.com>

server/src/main/java/org/eclipse/openvsx/LocalRegistryService.java

@@ -41,6 +41,7 @@
 import java.io.InputStream;
 import java.util.*;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import static org.eclipse.openvsx.cache.CacheService.*;
 import static org.eclipse.openvsx.entities.FileResource.*;
@@ -709,9 +710,10 @@ public ResultJson deleteReview(String namespace, String extensionName) {
     private List<Extension> getExtensions(SearchHits<ExtensionSearch> searchHits) {
         var ids = searchHits.stream()
                 .map(searchHit -> searchHit.getContent().id)
-                .collect(Collectors.toSet());
+                .distinct()
+                .collect(Collectors.toList());
 
-        var extensions = new ArrayList<>(repositories.findExtensions(ids).toList());
+        var extensions = findExtensions(ids).collect(Collectors.toList());
         var extensionIds = extensions.stream()
                 .map(Extension::getId)
                 .collect(Collectors.toSet());
@@ -737,6 +739,16 @@ private List<Extension> getExtensions(SearchHits<ExtensionSearch> searchHits) {
         return extensions;
     }
 
+    private Stream<Extension> findExtensions(Collection<Long> ids) {
+        var extById = new HashMap<Long, Extension>();
+        repositories.findExtensions(ids)
+                .forEach(ext -> extById.put(ext.getId(), ext));
+        return ids.stream()
+                .map(extById::get)
+                .filter(Objects::nonNull);
+    }
+
+
     private List<SearchEntryJson> toSearchEntries(SearchHits<ExtensionSearch> searchHits, ISearchService.Options options) {
         var serverUrl = UrlUtil.getBaseUrl();
         var extensions = getExtensions(searchHits);

server/src/test/java/org/eclipse/openvsx/RegistryAPITest.java

@@ -2064,7 +2064,7 @@ private List<Extension> mockSearch() {
         var searchOptions = new ISearchService.Options("foo", null, null, 10, 0, "desc", "relevance", false);
         Mockito.when(search.search(searchOptions))
                 .thenReturn(searchHits);
-        Mockito.when(repositories.findExtensions(Set.of(extension.getId())))
+        Mockito.when(repositories.findExtensions(List.of(extension.getId())))
                 .thenReturn(Streamable.of(extension));
         return Arrays.asList(extension);
     }