Merge fallbacks with the rest of the router #3158
Open
+252
−104
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.
Motivation
Closes #3138
Inheritance of fallbacks in nested routers does not work as documented. With this fallbacks of nested routers take precedence over outside routes with different prefix.
Since #1711 there are two
PathRouter
s inside eachRouter
, one for registered routes and one specifically for fallbacks. Both got merged or nested separately and were queried in turn. That means that a wildcard on the top of the first router can completely prevent ever hitting the fallback router.Solution
The fallback router was completely deleted. Instead routes for
/
and/{*}
are registered. This in turn works better with nesting and merging.This changes some behavior such as making it impossible to register a top-level wildcard after a fallback.
This PR also adds several tests to show how some of these collision work. Some of those should be considered to be changed.