fix: Use IOUtils toStream and toString #10975
Merged
Conversation
This file contains 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
caalador
added this to Iteration Reviews
in OLD Vaadin Flow ongoing work (Vaadin 10+)
via automation
Use IOUtils toString and toInputStream to not change any characters in the file content. fixes #10893
caalador
force-pushed
the
issues/10893_charset_problem
branch
from
7982bc6
to
b8fa115
Compare
| @@ -650,8 +651,8 @@ private static InputStream getStatsFromClassPath(VaadinService service) { | |||
| Stats statistics = service.getContext().getAttribute(Stats.class); | |||
|
|
|||
| if (statistics != null) { | |||
| return new ByteArrayInputStream( | |||
| statistics.statsJson.getBytes(StandardCharsets.UTF_8)); | |||
| return IOUtils.toInputStream(statistics.statsJson, | |||
There was a problem hiding this comment.
This the implementation which IOUtils.toInputStream delegates to
public static InputStream toInputStream(final String input, final Charset encoding) {
return new ByteArrayInputStream(input.getBytes(Charsets.toCharset(encoding)));
}
It's almost identical.
So this should not fix anything even though it may be considered as a small code improvement .
I guess the reason of changing chars is using UTF-8 as encoding while the json statistics is not in UTF-8 for some reason.
There was a problem hiding this comment.
This is just to keep the usage similar and more readable.
The main fix to the issue is to not use streamToString(stream) but IOUtils.toString(stream, StandardCharsets.UTF_8)
| @@ -650,8 +651,8 @@ private static InputStream getStatsFromClassPath(VaadinService service) { | |||
| Stats statistics = service.getContext().getAttribute(Stats.class); | |||
|
|
|||
| if (statistics != null) { | |||
| return new ByteArrayInputStream( | |||
| statistics.statsJson.getBytes(StandardCharsets.UTF_8)); | |||
| return IOUtils.toInputStream(statistics.statsJson, | |||
|
Added test. |
|
SonarQube analysis reported 4 issues
|
denis-anisimov
approved these changes
May 12, 2021
OLD Vaadin Flow ongoing work (Vaadin 10+)
automation
moved this from Iteration Reviews
to Done - pending release
May 12, 2021
vaadin-bot
pushed a commit
that referenced
this pull request
May 12, 2021
* fix: Use IOUtils toStream and toString Use IOUtils toString and toInputStream to not change any characters in the file content. fixes #10893
vaadin-bot
pushed a commit
that referenced
this pull request
May 12, 2021
* fix: Use IOUtils toStream and toString Use IOUtils toString and toInputStream to not change any characters in the file content. fixes #10893
vaadin-bot
added a commit
that referenced
this pull request
May 12, 2021
vaadin-bot
added a commit
that referenced
this pull request
May 12, 2021
Artur-
pushed a commit
that referenced
this pull request
May 18, 2021
* fix: Use IOUtils toStream and toString Use IOUtils toString and toInputStream to not change any characters in the file content. fixes #10893
|
This ticket/PR has been released with platform 21.0.0.alpha2. For prerelease versions, it will be included in its final version. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Use IOUtils toString and toInputStream
to not change any characters in the file content.
Using streamToString adds new lines for each usage,
but this can not be done for a json file that contains
in the string content new lines.
fixes #10893