Add sort arugment for the search API #4865
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -33,6 +33,7 @@ | |
| import java.nio.file.Files; | ||
| import java.nio.file.Path; | ||
| import java.util.LinkedHashMap; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.stream.Stream; | ||
|
|
||
|
|
@@ -133,6 +134,54 @@ public void copyDirectory(Path src, Path dest) throws IOException { | |
| } | ||
| } | ||
|
|
||
| /** | ||
| * Assumes the destination directory exists. | ||
| * @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 | ||
|
Comment on lines
+144
to
+146
Member
There was a problem hiding this comment. Perhaps move this comment to the method's javadoc so that it becomes more clear what it does.
Member
There was a problem hiding this comment. Also, there is a typo in "accross". |
||
| 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(); | ||
|
Member
There was a problem hiding this comment. I'd prefer to |
||
| 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)); | ||
|
Member
There was a problem hiding this comment. ditto for the |
||
| if (Files.isDirectory(sourcePath)) { | ||
| if (!Files.exists(destPath)) { | ||
| Files.createDirectories(destPath); | ||
| } | ||
| try { | ||
| Files.setLastModifiedTime(destPath, fileTime); | ||
| Files.setAttribute(destPath, "basic:creationTime", fileTime); | ||
| } catch (Exception ignored) { | ||
| // Not all filesystems support creationTime | ||
|
Member
There was a problem hiding this comment. Is the creation time necessary for the |
||
| } | ||
| } else { | ||
| // Ensure parent directory exists before copying file | ||
| Path parentDir = destPath.getParent(); | ||
| if (parentDir != null && !Files.exists(parentDir)) { | ||
|
Member
There was a problem hiding this comment. no need to check whether the destination exists for Also, I am pretty sure @ginoaugustine would come with a way how to use |
||
| Files.createDirectories(parentDir); | ||
| } | ||
| Files.copy(sourcePath, destPath, REPLACE_EXISTING, COPY_ATTRIBUTES); | ||
| Files.setLastModifiedTime(destPath, fileTime); | ||
| try { | ||
| Files.setAttribute(destPath, "basic:creationTime", fileTime); | ||
| } catch (Exception ignored) { | ||
| // Not all filesystems support creationTime | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private Path getDestinationRelativePath(Path sourceDirectory, Path sourceFile) { | ||
| // possibly strip zip filesystem for the startsWith method to work | ||
| var relativePath = Path.of(sourceDirectory.relativize(sourceFile).toString()); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please add
assertNotNullfor theurlbefore thetoURI()conversion like it is done in some other test classes to avoid code smells reported e.g. by SonarQube.