GH-7971: Add FileReadingMessageSource.directoryExpression
#10486
Conversation
…sion` Fixes: spring-projects#7971 Extend a `FileReadingMessageSource.directory` logic to the SpEL expression to evaluate on each scan * Introduce an internal `record DirFile` to keep the `File` and scanned directory per file * Propagate a new directory down to the `WatchServiceDirectoryScanner` and restart it * Calculate a root directory from the failed `Message` we offer back to the queue * Fix tests for a new `FileReadingMessageSource.directoryExpression` property * Expose a `Supplier<File>` configuration for Java DSL * Modify `FileTests.MyService.pollDirectories()` for a `Supplier<File>` configuration * Document this new feature
cppwfs
left a comment
cppwfs
left a comment
There was a problem hiding this comment.
Looks great!
My usual annoying nitpicks ;-)
| } | ||
|
|
||
| /** | ||
| * Specify a SpEL expression for an input directory. |
There was a problem hiding this comment.
Nitpick. But isn't it an implementation of Expression instead of a single implementation of SpELExpression?
There was a problem hiding this comment.
The framework is called SpEL and because of many Expression classes in the wild it would be better to be specific in our JavaDocs of what exactly framework an Expression instance is expected for this setter.
We also use SpEL term everywhere else, including docs, so it should not be confusing what is expected.
There was a problem hiding this comment.
Thanks! That makes sense. Just wanted to make sure.
| StandardIntegrationFlow integrationFlow = IntegrationFlow | ||
| .from(Files.inboundAdapter(() -> directories[index.getAndIncrement() % directories.length]) | ||
| .recursive(true), | ||
| e -> e.poller(p -> p.fixedDelay(100)) |
There was a problem hiding this comment.
Just curious, Was the drop to a delay from 1000 milli to 100 milli on purpose?
There was a problem hiding this comment.
True. I'm very suspicious when test is slower than it should be.
Like in this case, we've got before a delay of one second in between reading from those directories we iterate in the supplier.
Such a delay is not justified for this test goal.
There was a problem hiding this comment.
Cool. Just wanted to make sure!
cppwfs
left a comment
cppwfs
left a comment
There was a problem hiding this comment.
LGTM .
I love the addition!
2 participants
Fixes: #7971
Extend a
FileReadingMessageSource.directorylogic to the SpEL expression to evaluate on each scanrecord DirFileto keep theFileand scanned directory per fileWatchServiceDirectoryScannerand restart itMessagewe offer back to the queueFileReadingMessageSource.directoryExpressionpropertySupplier<File>configuration for Java DSLFileTests.MyService.pollDirectories()for aSupplier<File>configuration