Skip to content

improve streaming of jsonstrings #133

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

improve streaming of jsonstrings #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df1cf7d
replace for-loop with foreach from stream-api
Jun 10, 2024
a3f2190
also use stream-api foreach in strings toString
Jun 10, 2024
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
82 changes: 35 additions & 47 deletions impl/src/main/java/org/eclipse/parsson/JsonGeneratorImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,53 +540,37 @@ public void close() {
// begin end begin end
void writeEscapedString(CharSequence string) {
writeChar('"');
int len = string.length();
for(int i = 0; i < len; i++) {
int begin = i, end = i;
char c = string.charAt(i);
// find all the characters that need not be escaped
// unescaped = %x20-21 | %x23-5B | %x5D-10FFFF
while(c >= 0x20 && c <= 0x10ffff && c != 0x22 && c != 0x5c) {
i++; end = i;
if (i < len) {
c = string.charAt(i);
} else {
break;
}
}
// Write characters without escaping
if (begin < end) {
writeString(string, begin, end);
if (i == len) {
break;
}
}

switch (c) {
case '"':
case '\\':
writeChar('\\'); writeChar(c);
break;
case '\b':
writeChar('\\'); writeChar('b');
break;
case '\f':
writeChar('\\'); writeChar('f');
break;
case '\n':
writeChar('\\'); writeChar('n');
break;
case '\r':
writeChar('\\'); writeChar('r');
break;
case '\t':
writeChar('\\'); writeChar('t');
break;
default:
String hex = "000" + Integer.toHexString(c);
writeString("\\u" + hex.substring(hex.length() - 4));
}
}
string.chars()
.forEach(c -> {
if (c >= 0x20 && c <= 0x10ffff && c != 0x22 && c != 0x5c) {
writeChar(c);
} else {
switch (c) {
case '"':
case '\\':
writeChar('\\'); writeChar(c);
break;
case '\b':
writeChar('\\'); writeChar('b');
break;
case '\f':
writeChar('\\'); writeChar('f');
break;
case '\n':
writeChar('\\'); writeChar('n');
break;
case '\r':
writeChar('\\'); writeChar('r');
break;
case '\t':
writeChar('\\'); writeChar('t');
break;
default:
String hex = "000" + Integer.toHexString(c);
writeString("\\u" + hex.substring(hex.length() - 4));
}
}
});
writeChar('"');
}

Expand All @@ -611,6 +595,10 @@ void writeString(CharSequence str) {
writeString(str, 0, str.length());
}

void writeChar(final int c) {
writeChar((char) c);
}

void writeChar(char c) {
if (len >= buf.length) {
flushBuffer();
Expand Down
66 changes: 32 additions & 34 deletions impl/src/main/java/org/eclipse/parsson/JsonStringImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,40 +67,38 @@ public boolean equals(Object obj) {
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append('"');

for(int i = 0; i < value.length(); i++) {
char c = value.charAt(i);
// unescaped = %x20-21 | %x23-5B | %x5D-10FFFF
if (c >= 0x20 && c <= 0x10ffff && c != 0x22 && c != 0x5c) {
sb.append(c);
} else {
switch (c) {
case '"':
case '\\':
sb.append('\\'); sb.append(c);
break;
case '\b':
sb.append('\\'); sb.append('b');
break;
case '\f':
sb.append('\\'); sb.append('f');
break;
case '\n':
sb.append('\\'); sb.append('n');
break;
case '\r':
sb.append('\\'); sb.append('r');
break;
case '\t':
sb.append('\\'); sb.append('t');
break;
default:
String hex = "000" + Integer.toHexString(c);
sb.append("\\u").append(hex.substring(hex.length() - 4));
}
}
}

value.chars()
.forEach(c -> {
// unescaped = %x20-21 | %x23-5B | %x5D-10FFFF
if (c >= 0x20 && c <= 0x10ffff && c != 0x22 && c != 0x5c) {
sb.append((char) c);
} else {
switch (c) {
case '"':
case '\\':
sb.append('\\'); sb.append((char) c);
break;
case '\b':
sb.append('\\'); sb.append('b');
break;
case '\f':
sb.append('\\'); sb.append('f');
break;
case '\n':
sb.append('\\'); sb.append('n');
break;
case '\r':
sb.append('\\'); sb.append('r');
break;
case '\t':
sb.append('\\'); sb.append('t');
break;
default:
String hex = "000" + Integer.toHexString(c);
sb.append("\\u").append(hex.substring(hex.length() - 4));
}
}
});
sb.append('"');
return sb.toString();
}
Expand Down