Move unwrapping of delegate keys to a single location. #4465
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.
Move unwrapping of delegate keys to a single location.
This CL moves the unwrapping of the key directly into
ComponentDeclarations#delegates(Key)
instead of requiring all callers to remember to unwrap the key individually. This change will make this API less error-prone, as it's already caused one bug (b/147020838).Note: In order to make this change, I needed to refactor how we handled the strictMultibindingValidation flag. Rather than having the flag control whether or not we unwrap the key, the flag now just exits early from
resolverContainsDelegateDeclarationForBinding
, which should be functionally equivalent to how it works today. In particular, the delegate map multibindings are always wrapped today, so not unwrapping the key will always result in a miss when looking up the key in the map.RELNOTES=N/A