Backups/JSON-java
1
0
Fork 0
mirror of https://github.com/stleary/JSON-java.git synced 2025-08-03 03:15:32 -04:00
Code Issues Projects Releases Wiki Activity

fix(#871-strictMode): replaced stream with conventional loop for 1.6 compatibility

Browse Source
This commit is contained in:
rikkarth 2024-03-16 00:48:58 +00:00
parent 0ff368ca07
commit e2fe14d951
No known key found for this signature in database
GPG Key ID: 11E5F28B0AED6AC7
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/org/json/JSONTokener.java
View File

@ -396,7 +396,7 @@ public class JSONTokener {
public String nextTo(String delimiters) throws JSONException { public String nextTo(String delimiters) throws JSONException {
char c; char c;
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
for (;;) { for (; ; ) {
c = this.next(); c = this.next();
if (delimiters.indexOf(c) >= 0 || c == 0 || if (delimiters.indexOf(c) >= 0 || c == 0 ||
c == '\n' || c == '\r') { c == '\n' || c == '\r') {
@ -457,9 +457,9 @@ public class JSONTokener {
if (strictMode) { if (strictMode) {
Object valueToValidate = nextSimpleValue(c, true); Object valueToValidate = nextSimpleValue(c, true);
boolean isNumeric = valueToValidate.toString().chars().allMatch( Character::isDigit ); boolean isNumeric = checkIfValueIsNumeric(valueToValidate);
if(isNumeric){ if (isNumeric) {
return valueToValidate; return valueToValidate;
} }
@ -475,6 +475,15 @@ public class JSONTokener {
return nextSimpleValue(c); return nextSimpleValue(c);
} }
private boolean checkIfValueIsNumeric(Object valueToValidate) {
for (char c : valueToValidate.toString().toCharArray()) {
if (!Character.isDigit(c)) {
return false;
}
}
return true;
}
/** /**
* This method is used to get a JSONObject from the JSONTokener. The strictMode parameter controls the behavior of * This method is used to get a JSONObject from the JSONTokener. The strictMode parameter controls the behavior of
* the method when parsing the JSONObject. * the method when parsing the JSONObject.