fix: match literal path-extension downloads with trailing slash#24537
Merged
jason-p-pickering merged 1 commit intoJul 23, 2026
Conversation
Follow-up to #24479. Paths like /api/analytics.xlsx/ fully strip to /api/analytics, hit the JSON produces handler (406), then failed the literal fallback because the original URI still had the trailing slash and Spring 7 does not trailing-slash-match. Retry with only the trailing slash removed before the raw original path so literal download mappings still win. Covers the RestAssured basePath pattern used by AnalyticsAggregateDownloadTest.
|
david-mackessy
approved these changes
Jul 23, 2026
jason-p-pickering
self-requested a review
July 23, 2026 12:26
jason-p-pickering
approved these changes
Jul 23, 2026
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
3 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.
Summary
/api/analytics.xlsx/(trailing slash after the extension)./api/analytics.xlsx/never hit@GetMapping("/api/analytics.xlsx").Why this surfaced
Doris analytics PR run still had 1 failure after #24479:
AnalyticsAggregateDownloadTest.queryWithXlsxDownload→GET /api/analytics.xlsx/→ 406.RestAssured
basePath("analytics.xlsx") + get("")produces the trailing slash. Other download tests put the suffix in the resource id and never hit this path shape.Lookup order now
For
/api/analytics.xlsx/:/api/analytics(+ forced xlsx media type)/api/analytics.xlsx← new/api/analytics.xlsx/Test plan
mvn -pl dhis-web-api -Dtest=CustomRequestMappingHandlerMappingNormalizeTest test