erik/JSON-java
erik/JSON-java
1
0
Fork 0
mirror of https://github.com/ethauvin/JSON-java.git synced 2025-06-17 07:50:52 -07:00
Code Releases Activity

Updates to iterate on code points instead of characters and changes the encoding to only encode control characters as defined by ISO standard.

Browse source
This commit is contained in:
John J. Aylward 2016-09-22 14:13:14 -04:00
parent a2d3b59394
commit 34652a8706
1 changed files with 40 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

43
XML.java
View file

@ -62,6 +62,42 @@ public class XML {
/** The Character '/'. */
public static final Character SLASH = '/';
/**
* Creates an iterator for navigating Code Points in a string instead of
* characters.
*
* @see <a href=
* "http://stackoverflow.com/a/21791059/6030888">http://stackoverflow.com/a/21791059/6030888</a>
*/
private static Iterable<Integer> codePointIterator(final String string) {
return new Iterable<Integer>() {
@Override
public Iterator<Integer> iterator() {
return new Iterator<Integer>() {
private int nextIndex = 0;
private int length = string.length();
@Override
public boolean hasNext() {
return this.nextIndex < this.length;
}
@Override
public Integer next() {
int result = string.codePointAt(this.nextIndex);
this.nextIndex += Character.charCount(result);
return result;
}
@Override
public void remove() {
throw new UnsupportedOperationException();
}
};
}
};
}
/**
* Replace special characters with XML escapes:
*
@ -79,8 +115,7 @@ public class XML {
*/
public static String escape(String string) {
StringBuilder sb = new StringBuilder(string.length());
for (int i = 0, length = string.length(); i < length; i++) {
char c = string.charAt(i);
for (final int c : codePointIterator(string)) {
switch (c) {
case '&':
sb.append("&amp;");
@ -98,12 +133,12 @@ public class XML {
sb.append("&apos;");
break;
default:
if (c < ' ' || (c >= '\u0080' && c < '\u00a0') || (c >= '\u2000' && c < '\u2100')) {
if (Character.isISOControl(c)) {
sb.append("&#x");
sb.append(Integer.toHexString(c));
sb.append(";");
} else {
sb.append(c);
sb.append(new String(Character.toChars(c)));
}
}
}