GH-8800: Fix SMB Gateway for recursive MGET #8801
Closed
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
Fixes: spring-projectsgh-8800 The `SmbFile.getName()` returns plain file name, not with a sub-directory as it is expected by the `AbstractRemoteFileOutboundGateway` for (S)FTP protocols * Introduce `AbstractRemoteFileOutboundGateway.getFullFileName()` with dir and file name concatenation by default (as it was before) and override it in the `SmbOutboundGateway` to return the full path according this protocol. * Fix `SmbOutboundGateway.enhanceNameWithSubDirectory()` to return an `SmbFile` instance since it has all the info about remote file, include requested directory * Fix `SmbOutboundGateway.getFilename()` to remove the trailing `/` in the dir name since this is not what expected by the `AbstractRemoteFileOutboundGateway` logic **Cherry-pick to `6.1.x`**
|
NOTE: I ma changing our commit pattern to meet Backport Bot requirements: https://github.com/spring-io/backport-bot. |
|
Merged and cherry-picked to |
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.
Fixes: gh-8800
The
SmbFile.getName()returns plain file name, not with a sub-directory as it is expected by theAbstractRemoteFileOutboundGatewayfor (S)FTP protocolsAbstractRemoteFileOutboundGateway.getFullFileName()with dir and file name concatenation by default (as it was before) and override it in theSmbOutboundGatewayto return the full path according this protocol.SmbOutboundGateway.enhanceNameWithSubDirectory()to return anSmbFileinstance since it has all the info about remote file, include requested directorySmbOutboundGateway.getFilename()to remove the trailing/in the dir name since this is not what expected by theAbstractRemoteFileOutboundGatewaylogicCherry-pick to
6.1.x