Finalize the utils module refactoring
#4671
Merged
Conversation
This file contains 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
sschuberth
force-pushed
the
finalize-utils-refactoring
branch
from
723f807 to
a82648b
Compare
mnonnenmacher
requested changes
Nov 8, 2021
oheger-bosch
reviewed
Nov 8, 2021
| */ | ||
| fun archive(inputDir: File, zipFile: File, prefix: String = ""): Result<File> { | ||
| return runCatching { | ||
| fun archive(inputDir: File, zipFile: File, prefix: String = ""): File = |
There was a problem hiding this comment.
From the commit message, it is not clear to me why the strategy for error handling needs to be changed here. Kotlin's Result class should be independent on other utility functions. Maybe this becomes obvious in later commits, but it would be helpful to have a hint in the commit message.
There was a problem hiding this comment.
My reason for this change was that I needed to remove the dependency on showStackTrace(), which left the onFailure branch empty. So the function then only did an internal wrapping with runCatching, which I felt should be something that the caller should do, if desired. Also, it allowed to use a slightly more elegant syntax to return the zipFile.
This is a fixup for 9c9d138. Signed-off-by: Sebastian Schuberth <[email protected]>
Refactor some functions to not depend on classes from `core-utils` anymore as a preparation for moving `ArchiveUtils` to `common-utils`. Signed-off-by: Sebastian Schuberth <[email protected]>
This class can be used independently of ORT. Note that `core-utils` still needs to depend on `commons-compress` for its `XZCompressedLocalFileStorage`. Signed-off-by: Sebastian Schuberth <[email protected]>
This removes the warning log when a version requirement is not satisfied and the user configured to ignore this, but that should be fine in the context of upcoming changes that will relax the version requirements on external tools. Signed-off-by: Sebastian Schuberth <[email protected]>
sschuberth
force-pushed
the
finalize-utils-refactoring
branch
2 times, most recently
from
82c40cd to
01c3830
Compare
These are all functional in the sense that no mocking but real I/O is applied. Signed-off-by: Sebastian Schuberth <[email protected]>
Signed-off-by: Sebastian Schuberth <[email protected]>
Slightly modify the class so it can be used independently of ORT. Signed-off-by: Sebastian Schuberth <[email protected]>
Signed-off-by: Sebastian Schuberth <[email protected]>
Slightly modify the class so it can be used independently of ORT. Signed-off-by: Sebastian Schuberth <[email protected]>
Slightly modify the code so it can be used independently of ORT. Signed-off-by: Sebastian Schuberth <[email protected]>
Slightly modify the class so it can be used independently of ORT. Signed-off-by: Sebastian Schuberth <[email protected]>
Signed-off-by: Sebastian Schuberth <[email protected]>
…ils` This function can be used independently of ORT. Signed-off-by: Sebastian Schuberth <[email protected]>
sschuberth
force-pushed
the
finalize-utils-refactoring
branch
from
01c3830 to
bcd267f
Compare
mnonnenmacher
approved these changes
Nov 8, 2021
11 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Please have a look at the individual commit messages for the details.