-
Notifications
You must be signed in to change notification settings - Fork 89
DeepLink Query Parameter Value Template Matching #157
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
yutailang0119
wants to merge
3
commits into
android:main
Choose a base branch
from
yutailang0119:deeplink-recipes-query-parameter
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+17
−8
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change | ||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -72,15 +72,16 @@ internal class DeepLinkPattern<T : NavKey>( | |||||||||||||||||
| } | ||||||||||||||||||
|
|
||||||||||||||||||
| /** | ||||||||||||||||||
| * Parse supported queries into a map of queryParameterNames to [TypeParser] | ||||||||||||||||||
| * Parse supported queries into a map of queryParameterNames to [QueryParameter] | ||||||||||||||||||
| * | ||||||||||||||||||
| * This will be used later on to parse a provided query value into the correct KType | ||||||||||||||||||
| */ | ||||||||||||||||||
| val queryValueParsers: Map<String, TypeParser> = buildMap { | ||||||||||||||||||
| val queryParameters: Map<String, QueryParameter> = buildMap { | ||||||||||||||||||
| uriPattern.queryParameterNames.forEach { paramName -> | ||||||||||||||||||
| val elementIndex = serializer.descriptor.getElementIndex(paramName) | ||||||||||||||||||
| val paramValue = uriPattern.getQueryParameter(paramName)?.removePrefix("{")?.removeSuffix("}") | ||||||||||||||||||
| val elementIndex = serializer.descriptor.getElementIndex(paramValue ?: paramName) | ||||||||||||||||||
| val elementDescriptor = serializer.descriptor.getElementDescriptor(elementIndex) | ||||||||||||||||||
| this[paramName] = getTypeParser(elementDescriptor.kind) | ||||||||||||||||||
| this[paramName] = QueryParameter(paramValue, getTypeParser(elementDescriptor.kind)) | ||||||||||||||||||
| } | ||||||||||||||||||
| } | ||||||||||||||||||
|
|
||||||||||||||||||
|
|
@@ -92,6 +93,14 @@ internal class DeepLinkPattern<T : NavKey>( | |||||||||||||||||
| val isParamArg: Boolean, | ||||||||||||||||||
| val typeParser: TypeParser | ||||||||||||||||||
| ) | ||||||||||||||||||
|
|
||||||||||||||||||
| /** | ||||||||||||||||||
| * Metadata about a supported query parameter | ||||||||||||||||||
| */ | ||||||||||||||||||
| class QueryParameter( | ||||||||||||||||||
| val serialName: String?, | ||||||||||||||||||
| val typeParser: TypeParser, | ||||||||||||||||||
| ) | ||||||||||||||||||
|
Comment on lines
+100
to
+103
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. For classes that primarily hold data, like
Suggested change
|
||||||||||||||||||
| } | ||||||||||||||||||
|
|
||||||||||||||||||
| /** | ||||||||||||||||||
|
|
||||||||||||||||||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The use of the non-null assertion operator (
!!) on line 51 can cause aNullPointerExceptionif the request URI contains a query parameter that is not defined in the deep link pattern. This would crash the application. It's safer to handle this case by treating it as a non-match, which is consistent with how path segments are handled. Using aforloop instead offorEachallows for an early return from thematchfunction if an unknown parameter is found.