Fix resync BSQ blocks from resources #5900
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
Prevent a "URI is not hierarchical" IllegalArgumentException from the expression, 'new File(dirUrl.toURI())', which occurs on Linux & Windows when listing the resource directory of BSQ blocks. Adapt a solution from StackOverflow which uses two separate code paths depending on the environment, into the new method 'FileUtil::listResourceDirectory'. The issue is caused by the resource URL taking one of the two forms: file:/Users/[USER]/Java/bisq/bisq/p2p/out/production/resources/BsqBlocks_BTC_MAINNET jar:file:...p2p.jar!/BsqBlocks_BTC_MAINNET depending on whether the system is OSX or not.
Use 'java.nio.file.FileSystem' in place of 'java.util.jar.JarFile' to list all the resources under a given classpath (on Windows & Linux), as that is a bit neater and potentially more efficient than scanning the entire ZIP directory structure.
|
I think the Codacy check is going to fail, due to a missed Amending and force-pushing the last commit to fix. |
stejbac
force-pushed
the
fix-resync-blocks-from-resources
branch
from
706e3bd
to
746061e
Compare
ripcurlx
approved these changes
Dec 9, 2021
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.
Prevent a "URI is not hierarchical"
IllegalArgumentExceptionfrom the expression,new File(dirUrl.toURI()), which occurs on Linux & Windows when listing the resource directory of BSQ blocks. Adapt a solution from StackOverflow (together with the earlierjava.nio.file.FileSystem-based approach in #5898), which uses two separate code paths depending on the environment, into the new methodFileUtil::listResourceDirectory.The issue is caused by the resource URL taking one of the two forms:
depending on whether the system is OSX or not.
--
I tested the PR on Linux & Windows, but have not been able to test the absence of a regression on OSX (though I don't expect this, as it should use a similar code path to the original).