diff --git a/accessors-smart/pom.xml b/accessors-smart/pom.xml index e121764..834a9d5 100644 --- a/accessors-smart/pom.xml +++ b/accessors-smart/pom.xml @@ -17,7 +17,7 @@ limitations under the License. 4.0.0 net.minidev accessors-smart - 2.4.11 + 2.5.0 ASM based accessors helper used by json-smart Java reflect give poor performance on getter setter an constructor calls, accessors-smart use ASM to speed up those calls. bundle diff --git a/json-smart-action/pom.xml b/json-smart-action/pom.xml index b71b202..552e61c 100644 --- a/json-smart-action/pom.xml +++ b/json-smart-action/pom.xml @@ -2,7 +2,7 @@ 4.0.0 net.minidev json-smart-action - 2.4.11 + 2.5.0 JSON-smart-action Small and Fast Parser JSON (JavaScript Object Notation) is a lightweight data-interchange format. It is easy for humans to read and write. It is easy for machines to parse and generate. It is based on a subset of the JavaScript Programming Language, Standard ECMA-262 3rd Edition - December 1999. JSON is a text format that is completely language independent but uses conventions that are familiar to programmers of the C-family of languages, including C, C++, C#, Java, JavaScript, Perl, Python, and many others. These properties make JSON an ideal data-interchange language. bundle @@ -245,7 +245,7 @@ net.minidev json-smart - 2.4.11 + 2.5.0 diff --git a/json-smart/pom.xml b/json-smart/pom.xml index 909231c..5cc7a02 100644 --- a/json-smart/pom.xml +++ b/json-smart/pom.xml @@ -17,7 +17,7 @@ limitations under the License. 4.0.0 net.minidev json-smart - 2.4.11 + 2.5.0 JSON Small and Fast Parser JSON (JavaScript Object Notation) is a lightweight data-interchange format. It is easy for humans to read and write. It is easy for machines to parse and generate. It is based on a subset of the JavaScript Programming Language, Standard ECMA-262 3rd Edition - December 1999. JSON is a text format that is completely language independent but uses conventions that are familiar to programmers of the C-family of languages, including C, C++, C#, Java, JavaScript, Perl, Python, and many others. These properties make JSON an ideal data-interchange language. bundle @@ -260,7 +260,7 @@ limitations under the License. net.minidev accessors-smart - 2.4.11 + 2.5.0 diff --git a/json-smart/src/main/java/net/minidev/json/parser/JSONParser.java b/json-smart/src/main/java/net/minidev/json/parser/JSONParser.java index 482eac0..50daf9f 100644 --- a/json-smart/src/main/java/net/minidev/json/parser/JSONParser.java +++ b/json-smart/src/main/java/net/minidev/json/parser/JSONParser.java @@ -99,7 +99,7 @@ public class JSONParser { * * @since 2.5 */ - public static final int FINITE_JSON_DEPTH = 4096; + public static final int LIMIT_JSON_DEPTH = 4096; /** diff --git a/json-smart/src/main/java/net/minidev/json/parser/JSONParserBase.java b/json-smart/src/main/java/net/minidev/json/parser/JSONParserBase.java index f83cfaa..2f00d26 100644 --- a/json-smart/src/main/java/net/minidev/json/parser/JSONParserBase.java +++ b/json-smart/src/main/java/net/minidev/json/parser/JSONParserBase.java @@ -91,7 +91,7 @@ abstract class JSONParserBase { protected final boolean useIntegerStorage; protected final boolean reject127; protected final boolean unrestictBigDigit; - protected final boolean finiteJsonDepth; + protected final boolean limitJsonDepth; public JSONParserBase(int permissiveMode) { this.acceptNaN = (permissiveMode & JSONParser.ACCEPT_NAN) > 0; @@ -108,7 +108,7 @@ public JSONParserBase(int permissiveMode) { this.checkTaillingSpace = (permissiveMode & JSONParser.ACCEPT_TAILLING_SPACE) == 0; this.reject127 = (permissiveMode & JSONParser.REJECT_127_CHAR) > 0; this.unrestictBigDigit = (permissiveMode & JSONParser.BIG_DIGIT_UNRESTRICTED) > 0; - this.finiteJsonDepth = (permissiveMode & JSONParser.FINITE_JSON_DEPTH) > 0; + this.limitJsonDepth = (permissiveMode & JSONParser.LIMIT_JSON_DEPTH) > 0; } public void checkControleChar() throws ParseException { @@ -298,7 +298,7 @@ protected Number parseNumber(String s) throws ParseException { protected T readArray(JsonReaderI mapper) throws ParseException, IOException { if (c != '[') throw new RuntimeException("Internal Error"); - if (finiteJsonDepth && ++this.depth > MAX_DEPTH) { + if (limitJsonDepth && ++this.depth > MAX_DEPTH) { throw new ParseException(pos, ERROR_UNEXPECTED_JSON_DEPTH, c); } Object current = mapper.createArray(); @@ -555,7 +555,7 @@ protected T readObject(JsonReaderI mapper) throws ParseException, IOExcep // if (c != '{') throw new RuntimeException("Internal Error"); - if (finiteJsonDepth && ++this.depth > MAX_DEPTH) { + if (limitJsonDepth && ++this.depth > MAX_DEPTH) { throw new ParseException(pos, ERROR_UNEXPECTED_JSON_DEPTH, c); } Object current = mapper.createObject(); diff --git a/json-smart/src/test/java/net/minidev/json/test/TestOverflow.java b/json-smart/src/test/java/net/minidev/json/test/TestOverflow.java index 04a4ea9..9dd3541 100644 --- a/json-smart/src/test/java/net/minidev/json/test/TestOverflow.java +++ b/json-smart/src/test/java/net/minidev/json/test/TestOverflow.java @@ -46,7 +46,7 @@ public void shouldNotFailWhenInfiniteJsonDepth() throws Exception { } String s = sb.toString(); try { - JSONParser parser = new JSONParser(DEFAULT_PERMISSIVE_MODE & ~JSONParser.FINITE_JSON_DEPTH); + JSONParser parser = new JSONParser(DEFAULT_PERMISSIVE_MODE & ~JSONParser.LIMIT_JSON_DEPTH); parser.parse(s, JSONValue.defaultReader.DEFAULT); } catch (ParseException e) { fail();