INT-3989: Add FileReadingMessageSource.WatchServiceDirectoryScanner
#1774
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
|
Pushed some optimization and testing. |
|
Pushed the |
| */ | ||
| public void setWatchEvents(WatchEventType... watchEvents) { | ||
| Assert.notEmpty(watchEvents, "'watchEvents' must not be empty."); | ||
| this.watchEvents = watchEvents; |
There was a problem hiding this comment.
Arrays.copyOf(watchEvents, watchEvents.length)
|
Pushed.
See commit comments. |
| else { | ||
| files.remove(file); | ||
| files.add(file); | ||
| } | ||
| } |
There was a problem hiding this comment.
We should probably add a debug log here "File removed since watch event received".
JIRA: https://jira.spring.io/browse/INT-3989, https://jira.spring.io/browse/INT-3990, https://jira.spring.io/browse/INT-3988 * Deprecate top-level `WatchServiceDirectoryScanner` because of inconsistency around `Lifecycle` and shared `directory` property * Copy/paste its logic into the `FileReadingMessageSource.WatchServiceDirectoryScanner` to hide that inconsistency, but still get a gain from the `WatchService` benefits * Add support for the `StandardWatchEventKinds.ENTRY_MODIFY` and `StandardWatchEventKinds.ENTRY_DELETE` events in the `FileReadingMessageSource.WatchServiceDirectoryScanner` * Introduce `useWatchService` option to switch to the internal `FileReadingMessageSource.WatchServiceDirectoryScanner` * Make `CompositeFileListFilter` also as `ResettableFileListFilter` * Deprecate weird `FileReadingMessageSource.onSend()` method and remove its usage from tests * Modify `WatchServiceDirectoryScannerTests` for the new logic * Document changes
Optimize the `filesFromEvents()` logic replacing item with the fresh event sources. Remove the item from the result set in case of `DELETE` event, because file removal generates both `MODIFY` and `DELETE` events.
… the specific events, not only `CREATE` or all of them. * Modify tests and docs to reflect the new API
* Improve `FileReadingMessageSource.setWatchEvents()` * Add `file.exists()` before adding file from event.
With the fact of those logs provide more optimizations:
* Don't register the same directory for watching:
- use the `ConcurrentMap<Path, WatchKey> pathKeys` to track registrations
- any modification within the directory causes the `ENTRY_MODIFY` for the directory as well.
So, skip such an event exactly for the directory during `walkDirectory`
* Add debug logs in case of `ENTRY_DELETE`
|
Pushed. |
|
Merged as 7b1f77a |
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.
JIRA: https://jira.spring.io/browse/INT-3989,
https://jira.spring.io/browse/INT-3990,
https://jira.spring.io/browse/INT-3988
WatchServiceDirectoryScannerbecause of inconsistency aroundLifecycleand shareddirectorypropertyFileReadingMessageSource.WatchServiceDirectoryScannerto hide that inconsistency, but still get a gain from theWatchServicebenefitsStandardWatchEventKinds.ENTRY_MODIFYandStandardWatchEventKinds.ENTRY_DELETEevents in theFileReadingMessageSource.WatchServiceDirectoryScanneruseWatchServiceoption to switch to the internalFileReadingMessageSource.WatchServiceDirectoryScannerCompositeFileListFilteralso asResettableFileListFilterFileReadingMessageSource.onSend()method and remove its usage from testsWatchServiceDirectoryScannerTestsfor the new logic