GH-10162: The full file path for PersistentAcceptOnceFileListFilter
#10420
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
…FileListFilter` Fixes: spring-projects#10162 The `AbstractPersistentAcceptOnceFileListFilter` may cause a problem with entries in the `MetadataStore` when the same file name is used from different directories. Let's imagine a scenario when remote directories are created every day with respective timestamp, e.g. today `20250828`, tomorrow `20250829`. The files in those directories are based on customer names: `customer1.xml`, `customer2.xml` etc. Since most of the `AbstractPersistentAcceptOnceFileListFilter` implementations do just something like this: `return file.getName();` that would lead to the same key for the `MetadataStore` operations. * Fix `SmbPersistentAcceptOnceFileListFilter` to use `SmbFile.getUncPath()` as a notation of the full path file * Fix `SftpPersistentAcceptOnceFileListFilter` to use `SftpClient.DirEntry.getLongFilename()` if it is not empty. * Fix `SftpSession.list()` to populated the mentioned `longFileName` into a new `SftpClient.DirEntry` instance based on just fetched * Introduce an `EnhancedFTPFile` adapter to delegate to the original `FTPFile` and populate an additional `longFileName` property * Check for this new class in the `FtpPersistentAcceptOnceFileListFilter` to extract its `longFileName` property
cppwfs
requested changes
Sep 15, 2025
Contributor
cppwfs
left a comment
cppwfs
left a comment
There was a problem hiding this comment.
Looks great! Just my usual nitpicks!
...ng-integration-ftp/src/main/java/org/springframework/integration/ftp/session/FtpSession.java
Outdated
Show resolved
Hide resolved
...ng-integration-ftp/src/main/java/org/springframework/integration/ftp/session/FtpSession.java
Outdated
Show resolved
Hide resolved
...org/springframework/integration/ftp/inbound/FtpInboundRemoteFileSystemSynchronizerTests.java
Show resolved
Hide resolved
* Improve `FtpSession.list()` to use a new array instead of `LinkedList` * Also, use `.` as a working directory placeholder and always populate a long file name
Contributor
|
LGTM. Thanks for working on this. It's awesome! |
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: #10162
The
AbstractPersistentAcceptOnceFileListFiltermay cause a problem with entries in theMetadataStorewhen the same file name is used from different directories. Let's imagine a scenario when remote directories are created every day with respective timestamp, e.g. today20250828, tomorrow20250829.The files in those directories are based on customer names:
customer1.xml,customer2.xmletc.Since most of the
AbstractPersistentAcceptOnceFileListFilterimplementations do just something like this:return file.getName();that would lead to the same key for theMetadataStoreoperations.SmbPersistentAcceptOnceFileListFilterto useSmbFile.getUncPath()as a notation of the full path fileSftpPersistentAcceptOnceFileListFilterto useSftpClient.DirEntry.getLongFilename()if it is not empty.SftpSession.list()to populated the mentionedlongFileNameinto a newSftpClient.DirEntryinstance based on just fetchedEnhancedFTPFileadapter to delegate to the originalFTPFileand populate an additionallongFileNamepropertyFtpPersistentAcceptOnceFileListFilterto extract itslongFileNameproperty