Merge branch 'master' into 4740-feat

Signed-off-by: Bernát Gábor <[email protected]>

Author: gaborbernat

.github/workflows/build.yml

@@ -57,7 +57,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: ./dev/main
     - name: Upload artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: opengrok-${{ github.sha }}-${{ matrix.os }}.tar.gz
         path: distribution/target/opengrok-*.tar.gz

opengrok-indexer/src/test/java/org/opengrok/indexer/search/SearchEngineTest.java

@@ -167,7 +167,7 @@ void testSortOrderLastModified() {
         int hitsCount = instance.search();
         List<Hit> hits = new ArrayList<>();
         instance.results(0, hitsCount, hits);
-        assertTrue(hits.size() != 6, "Should return at least 2 hits for RELEVANCY sort to check order");
+        assertTrue(hits.size() == 6, "Should return at least 2 hits for RELEVANCY sort to check order");
 
         String[] results = hits.stream().
                 map(hit -> hit.getPath() + "@" + hit.getLineno()).
@@ -195,7 +195,7 @@ void testSortOrderByPath() {
         int hitsCount = instance.search();
         List<Hit> hits = new ArrayList<>();
         instance.results(0, hitsCount, hits);
-        assertTrue(hits.size() != 11, "Should return at least 2 hits for RELEVANCY sort to check order");
+        assertTrue(hits.size() == 11, "Should return at least 2 hits for RELEVANCY sort to check order");
 
         String[] results = hits.stream().
                 map(hit -> hit.getPath() + "@" + hit.getLineno()).

opengrok-indexer/src/test/java/org/opengrok/indexer/util/TestRepository.java

@@ -32,6 +32,8 @@
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.attribute.FileTime;
+import java.time.Instant;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -135,35 +137,34 @@ public void copyDirectory(Path src, Path dest) throws IOException {
     }
 
     /**
-     * Assumes the destination directory exists.
+     * Create a deterministic order of paths for creation time.
+     * This is so last modified time indexing is stable in tests. Note we cannot use
+     * Files.copy(sourceFile, destPath, REPLACE_EXISTING, COPY_ATTRIBUTES) as the original creation time is the user
+     * checkout and not different across files.
+     *
      * @param src source directory
      * @param dest destination directory
      * @throws IOException on error
      */
     public void copyDirectoryWithUniqueModifiedTime(Path src, Path dest) throws IOException {
-        // Create a deterministic order of paths for creation time, so last modified time indexing is stable in tests
-        // note we cannot use Files.copy(sourceFile, destPath, REPLACE_EXISTING, COPY_ATTRIBUTES)
-        // as the original creation time is the user checkout and not different accross files
-        List<Path> allPaths;
+          List<Path> allPaths;
         try (Stream<Path> stream = Files.walk(src)) {
             allPaths = stream.filter(p -> !p.equals(src)).sorted().toList();
         }
         // Set base time to now, and go ahead in time for each subsequent path by 1 minute
-        java.time.Instant baseTime = java.time.Instant.now();
+        Instant baseTime = java.time.Instant.now();
         for (int i = 0; i < allPaths.size(); i++) {
             Path sourcePath = allPaths.get(i);
             Path destRelativePath = getDestinationRelativePath(src, sourcePath);
             Path destPath = dest.resolve(destRelativePath);
-            var fileTime = java.nio.file.attribute.FileTime.from(baseTime.plusSeconds(i * 60L));
+            var fileTime = FileTime.from(baseTime.plusSeconds(i * 60L));
             if (Files.isDirectory(sourcePath)) {
-                if (!Files.exists(destPath)) {
-                    Files.createDirectories(destPath);
-                }
+                Files.createDirectories(destPath);
                 Files.setLastModifiedTime(destPath, fileTime);
             } else {
                 // Ensure parent directory exists before copying file
                 Path parentDir = destPath.getParent();
-                if (parentDir != null && !Files.exists(parentDir)) {
+                if (parentDir != null) {
                     Files.createDirectories(parentDir);
                 }
                 Files.copy(sourcePath, destPath, REPLACE_EXISTING, COPY_ATTRIBUTES);

opengrok-web/src/main/java/org/opengrok/web/api/v1/controller/SearchController.java

@@ -59,7 +59,7 @@ public class SearchController {
     public static final String PATH = "search";
 
     private static final int MAX_RESULTS = 1000;
-    private static final String DEFAULT_SORT_ORDER = "relevancy";
+    public static final String DEFAULT_SORT_ORDER = "relevancy";
 
     private final SuggesterService suggester;
 

opengrok-web/src/test/java/org/opengrok/web/api/v1/controller/SearchControllerTest.java

@@ -35,6 +35,7 @@
 import org.junit.jupiter.api.Test;
 import org.opengrok.indexer.configuration.RuntimeEnvironment;
 import org.opengrok.indexer.util.TestRepository;
+import org.opengrok.indexer.web.SortOrder;
 import org.opengrok.web.api.v1.RestApp;
 
 import java.util.Collections;
@@ -86,4 +87,9 @@ void testSearchCors() {
                 .get();
         assertEquals("*", response.getHeaderString(ALLOW_CORS_HEADER));
     }
+
+    @Test
+    void defaultSortOrderRelevancy() {
+        assertEquals(SearchController.DEFAULT_SORT_ORDER, SortOrder.RELEVANCY.name().toLowerCase());
+    }
 }