-
Notifications
You must be signed in to change notification settings - Fork 931
Fix EC2 DescribeInstances query use locale-dependent formatting #6238
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
Conversation
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.
Overall change looks good - Are there other areas where we are formatting URL components that we should make a similar fix for?
@@ -31,7 +32,8 @@ public class ListQueryMarshaller implements QueryMarshaller<List<?>> { | |||
listTrait.isFlattened() ? | |||
String.format("%s.%d", path, i + 1) : | |||
String.format("%s.%s.%d", path, listTrait.memberFieldInfo().locationName(), i + 1); | |||
private static final PathResolver EC2_QUERY_PATH_RESOLVER = (path, i, listTrait) -> String.format("%s.%d", path, i + 1); | |||
private static final PathResolver EC2_QUERY_PATH_RESOLVER = (path, i, listTrait) -> String.format(Locale.ROOT, "%s.%d", path |
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.
Would it be simpler to just do path + "." + (i+1)
?
String.format is relatively slow compared to building the string manually, anyway.
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.
Thanks for the suggestion! will check other path resolvers that uses String.format("%d")
. Just did a test and using concatenation also fixes the locale problem.
.../main/java/software/amazon/awssdk/protocols/query/internal/marshall/ListQueryMarshaller.java
Outdated
Show resolved
Hide resolved
Good suggestion! I think technically this fix could be applied to all path resolver that uses |
.../main/java/software/amazon/awssdk/protocols/query/internal/marshall/ListQueryMarshaller.java
Outdated
Show resolved
Hide resolved
|
This pull request has been closed and the conversation has been locked. Comments on closed PRs are hard for our team to see. If you need more assistance, please open a new issue that references this one. |
Motivation and Context
User reported the issue #5968. Currently we are render the filters using locale-dependent numerals, UTF-8-encoded. For example, for instance running in the ne (Nepalese) local the query uses
Filter.%E0%A5%A7.Name
rather thanFilter.1.Name
, where%E0%A5%A7
is the UTF-8 encoding forU+0967 DEVANAGARI DIGIT ONE
which is the rendering for the integer 1 in this locale. The expected behavior is in all locales, we should render the filters using ASCII digits 0 to 9 only.Modifications
The current ListQueryMarshaller code uses
String.format("%s.%d", path, i + 1
) which is locale-dependent. When formatting the%d
(decimal integer), Java uses the system's default locale to determine how to display numbers.Locale.ROOT
is Java's locale-neutral locale. By adding that to String.format, it will always produce ASCII digits regardless of system locale. This issue only appear for Java version 9 and above.Testing
Added unit test for ListQueryMarshaller class and also did a local integration test using the self-repro code provided in the original issue.
Screenshots (if appropriate)
Types of changes
Checklist
mvn install
succeedsscripts/new-change
script and following the instructions. Commit the new file created by the script in.changes/next-release
with your changes.License