Fix WebJar resource handler mappings for Swagger UI resources #3146
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
This PR addresses issue #3145, and does the following:
Removes the
springdoc.webjars.prefixproperty in favour of thespring.mvc.webjars-path-patternandspring.webflux.webjars-path-patternproperties.Fixes the incorrect order of
uiRootPathfor the resource handler mapping patterns.Removes the erroneous use of
uiRootPathat the start of the WebJar mapping.Ensures that WebJar mappings are not added if resource mappings at
/webjars/**have been disabled (i.e. ifspring.web.resources.add-mappingshas been set tofalse)Make the behaviour of WebJar mappings consistent between WebFlux and WebMvc, as both map WebJar resources to
/webjars/**by default.Modify and add tests to ensure that the WebJar mappings work correctly (as expected by issue Swagger UI shows petstore swagger by default in webflux #2969).