Fix native file monitor relative URI handling#3258
Merged
ryanjbaxter merged 1 commit intoJun 25, 2026
Merged
Conversation
Fixes spring-cloudgh-2997 Signed-off-by: hutiefang <hutiefang@qq.com>
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
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-2997
This updates the file monitor path resolution for native search locations that use relative file URIs such as
file:target/config.dorfile:./config.d.Previously,
FileMonitorConfigurationresolved existing native resources withPaths.get(resource.getURI()). For relative file resources this can throwIllegalArgumentException: URI is not hierarchical, causing the path to be skipped and local config changes not to be monitored.The fix resolves
FileSystemResourceandFileUrlResourcethroughresource.getFile().toPath().toAbsolutePath().normalize(), while keeping the existing URI-based fallback for other resource types.Verification:
Cannot resolve URI for path: file:target/...and an empty monitored directory set../mvnw -pl spring-cloud-config-monitor -Dtest=FileMonitorConfigurationTest#testStart_withNativeEnvironmentRepositoryAndRelativeFileUri -Dstyle.color=never --no-transfer-progress test./mvnw -pl spring-cloud-config-monitor -Dtest=FileMonitorConfigurationTest -Dstyle.color=never --no-transfer-progress testgit diff --check