GH-3247: Fix SftpSession.exists for error code
#3248
Merged
Conversation
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
Fixes spring-projects#3247 When there is no path on the SFTP server, a `ChannelSftp.SSH_FX_NO_SUCH_FILE` error is returned in the thrown `SftpException`. * Fix `SftpSession.exists()` to check for the `SSH_FX_NO_SUCH_FILE` to return `false` and re-throw an exception otherwise * Add mock test for `SftpSession.exists()` * Add `org.mockito.AdditionalMatchers` to `checkstyle.xml` exclusions **Cherry-pick to 5.2.x & 5.1.x**
garyrussell
suggested changes
Apr 13, 2020
Contributor
garyrussell
left a comment
garyrussell
left a comment
There was a problem hiding this comment.
LGTM, but I think we need a test against the mina server, e.g. in SftpServerOutboundTests to verify we actually get that result from JSch.
Contributor
|
Probably not related but |
garyrussell
approved these changes
Apr 14, 2020
Member
Author
|
It isn't related, indeed, but I can't figure out such a sporadic failure. Something is broken sometimes on Mina. Feel free to merge! Thanks |
garyrussell
pushed a commit
that referenced
this pull request
Apr 14, 2020
* GH-3247: Fix `SftpSession.exists` for error code Fixes #3247 When there is no path on the SFTP server, a `ChannelSftp.SSH_FX_NO_SUCH_FILE` error is returned in the thrown `SftpException`. * Fix `SftpSession.exists()` to check for the `SSH_FX_NO_SUCH_FILE` to return `false` and re-throw an exception otherwise * Add mock test for `SftpSession.exists()` * Add `org.mockito.AdditionalMatchers` to `checkstyle.xml` exclusions **Cherry-pick to 5.2.x & 5.1.x** * * Add exists tests against Mina embedded server
Contributor
|
Hmmm - I just cherry-picked this to 5.2 but while resolving conflicts in 5.1, I changed the exception to UncheckedIOException to avoid a breaking change. I will push that to the other branches as well. |
garyrussell
pushed a commit
that referenced
this pull request
Apr 14, 2020
* GH-3247: Fix `SftpSession.exists` for error code Fixes #3247 When there is no path on the SFTP server, a `ChannelSftp.SSH_FX_NO_SUCH_FILE` error is returned in the thrown `SftpException`. * Fix `SftpSession.exists()` to check for the `SSH_FX_NO_SUCH_FILE` to return `false` and re-throw an exception otherwise * Add mock test for `SftpSession.exists()` * Add `org.mockito.AdditionalMatchers` to `checkstyle.xml` exclusions **Cherry-pick to 5.2.x & 5.1.x** * * Add exists tests against Mina embedded server
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Fixes #3247
When there is no path on the SFTP server, a
ChannelSftp.SSH_FX_NO_SUCH_FILEerror is returned in the thrown
SftpException.SftpSession.exists()to check for theSSH_FX_NO_SUCH_FILEtoreturn
falseand re-throw an exception otherwiseSftpSession.exists()org.mockito.AdditionalMatcherstocheckstyle.xmlexclusionsCherry-pick to 5.2.x & 5.1.x