Skip to content

[#73] Avoid String creation using system default charset #74

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Apr 24, 2021
Merged

[#73] Avoid String creation using system default charset #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions json-smart/src/main/java/net/minidev/json/parser/JSONParserByteArray.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
import net.minidev.json.JSONValue;
import net.minidev.json.writer.JsonReaderI;

import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;

/**
* Parser for JSON text. Please note that JSONParser is NOT thread-safe.
*
Expand Down Expand Up @@ -59,7 +62,7 @@ public <T> T parse(byte[] in, JsonReaderI<T> mapper) throws ParseException {
}

protected void extractString(int beginIndex, int endIndex) {
xs = new String(in, beginIndex, endIndex - beginIndex);
xs = new String(in, beginIndex, endIndex - beginIndex, StandardCharsets.UTF_8);
}

protected void extractStringTrim(int start, int stop) {
Expand All @@ -71,7 +74,7 @@ protected void extractStringTrim(int start, int stop) {
while ((start < stop) && (val[stop - 1] <= ' ')) {
stop--;
}
xs = new String(in, start, stop - start);
xs = new String(in, start, stop - start, StandardCharsets.UTF_8);
}

protected int indexOf(char c, int pos) {
Expand Down
3 changes: 2 additions & 1 deletion json-smart/src/test/java/net/minidev/json/test/TestUtf8.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ public static Stream<Arguments> languages() {
Arguments.of("Russian", "Русский"), Arguments.of("Farsi", "فارسی"), Arguments.of("Korean", "한국어"),
Arguments.of("Armenian", "Հայերեն"), Arguments.of("Hindi", "हिन्दी"), Arguments.of("Hebrew", "עברית"),
Arguments.of("Chinese", "中文"), Arguments.of("Amharic", "አማርኛ"), Arguments.of("Malayalam", "മലയാളം"),
Arguments.of("Assyrian Neo-Aramaic", "ܐܬܘܪܝܐ"), Arguments.of("Georgian", "მარგალური"));
Arguments.of("Assyrian Neo-Aramaic", "ܐܬܘܪܝܐ"), Arguments.of("Georgian", "მარგალური"),
Arguments.of("Emojis", "🐶🐱🐭🐹🐰🦊🐻🐼🐻‍❄🐨🐯🦁🐮🐷🐽🐸🐵🙈🙉🙊🐒🐔🐧🐦🐤🐣🐥🦆🦅🦉🦇🐺🐗🐴🦄🐝🐛"));
};

@ParameterizedTest
Expand Down