This repository was archived by the owner on Dec 20, 2025. It is now read-only.
fix(retrofit2): fix retrofit2 issues#1875
Merged
mergify[bot] merged 3 commits intospinnaker:masterfrom Feb 27, 2025
Merged
Conversation
…ryMap is used without generics: `java.lang.IllegalArgumentException: Map must include generic types (e.g., Map<String, String>)`
…error: `java.lang.IllegalArgumentException: Map must include generic types (e.g., Map<String, String>)`
dbyron-sf
reviewed
Feb 27, 2025
| } | ||
|
|
||
| List<Map> search(String provider, String query, String region, String account, Integer count, Map<String, Object> additionalFilters, String selectorKey) { | ||
| List<Map> search(String provider, String query, String region, String account, Integer count, Map<String, String> additionalFilters, String selectorKey) { |
Contributor
There was a problem hiding this comment.
Apparently the only call to this is from ImageController.findImages and the value in the Map it uses is a String, so this seems safe.
Contributor
There was a problem hiding this comment.
Well, I merged this too soon...I don't think it's sufficient. We're missing more test coverage and groovy isn't helping. That code in ImageController is gonna fail with
'search' in 'com. netflix. spinnaker. gate. services. ImageService' cannot be applied to '(java. lang. String, java. lang. String, java. lang. String, java. lang. String, java. lang. Integer, java. util. Map<java. lang. Object,java. lang. Object>, java. lang. String)'
I'm looking in to a test/fix.
Contributor
There was a problem hiding this comment.
Apparently #1877 isn't required, but it makes me feel better.
dbyron-sf
approved these changes
Feb 27, 2025
Contributor
|
@Mergifyio backport release-1.37.x |
Contributor
✅ Backports have been createdDetails
|
mergify bot
pushed a commit
that referenced
this pull request
Feb 27, 2025
* test(retrofit2): add test to demonstrate the following error when QueryMap is used without generics: `java.lang.IllegalArgumentException: Map must include generic types (e.g., Map<String, String>)` * fix(retrofit2): fix non-generics QueryMap which causes the following error: `java.lang.IllegalArgumentException: Map must include generic types (e.g., Map<String, String>)` * fix(retrofit2): fix `A @path parameter must not come after a @Query` error (cherry picked from commit bdf8922)
mergify bot
added a commit
that referenced
this pull request
Feb 27, 2025
* test(retrofit2): add test to demonstrate the following error when QueryMap is used without generics: `java.lang.IllegalArgumentException: Map must include generic types (e.g., Map<String, String>)` * fix(retrofit2): fix non-generics QueryMap which causes the following error: `java.lang.IllegalArgumentException: Map must include generic types (e.g., Map<String, String>)` * fix(retrofit2): fix `A @path parameter must not come after a @Query` error (cherry picked from commit bdf8922) Co-authored-by: Kiran Godishala <[email protected]>
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Addressed the following two issues which occurred due to restrictions in retrofit2 :