Skip to content

Commit 0a35821

Browse files
committed
bump the version
1 parent b50106e commit 0a35821

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

accessors-smart/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ limitations under the License.
1717
<modelVersion>4.0.0</modelVersion>
1818
<groupId>net.minidev</groupId>
1919
<artifactId>accessors-smart</artifactId>
20-
<version>2.4.11</version>
20+
<version>2.5.0</version>
2121
<name>ASM based accessors helper used by json-smart</name>
2222
<description>Java reflect give poor performance on getter setter an constructor calls, accessors-smart use ASM to speed up those calls.</description>
2323
<packaging>bundle</packaging>

json-smart-action/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<modelVersion>4.0.0</modelVersion>
33
<groupId>net.minidev</groupId>
44
<artifactId>json-smart-action</artifactId>
5-
<version>2.4.11</version>
5+
<version>2.5.0</version>
66
<name>JSON-smart-action Small and Fast Parser</name>
77
<description>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.</description>
88
<packaging>bundle</packaging>
@@ -245,7 +245,7 @@
245245
<dependency>
246246
<groupId>net.minidev</groupId>
247247
<artifactId>json-smart</artifactId>
248-
<version>2.4.11</version>
248+
<version>2.5.0</version>
249249
</dependency>
250250
</dependencies>
251251
</project>

json-smart/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ limitations under the License.
1717
<modelVersion>4.0.0</modelVersion>
1818
<groupId>net.minidev</groupId>
1919
<artifactId>json-smart</artifactId>
20-
<version>2.4.11</version>
20+
<version>2.5.0</version>
2121
<name>JSON Small and Fast Parser</name>
2222
<description>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.</description>
2323
<packaging>bundle</packaging>
@@ -260,7 +260,7 @@ limitations under the License.
260260
<dependency>
261261
<groupId>net.minidev</groupId>
262262
<artifactId>accessors-smart</artifactId>
263-
<version>2.4.11</version>
263+
<version>2.5.0</version>
264264
</dependency>
265265
</dependencies>
266266
</project>

json-smart/src/main/java/net/minidev/json/parser/JSONParser.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public class JSONParser {
9999
*
100100
* @since 2.5
101101
*/
102-
public static final int FINITE_JSON_DEPTH = 4096;
102+
public static final int LIMIT_JSON_DEPTH = 4096;
103103

104104

105105
/**

json-smart/src/main/java/net/minidev/json/parser/JSONParserBase.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ abstract class JSONParserBase {
9191
protected final boolean useIntegerStorage;
9292
protected final boolean reject127;
9393
protected final boolean unrestictBigDigit;
94-
protected final boolean finiteJsonDepth;
94+
protected final boolean limitJsonDepth;
9595

9696
public JSONParserBase(int permissiveMode) {
9797
this.acceptNaN = (permissiveMode & JSONParser.ACCEPT_NAN) > 0;
@@ -108,7 +108,7 @@ public JSONParserBase(int permissiveMode) {
108108
this.checkTaillingSpace = (permissiveMode & JSONParser.ACCEPT_TAILLING_SPACE) == 0;
109109
this.reject127 = (permissiveMode & JSONParser.REJECT_127_CHAR) > 0;
110110
this.unrestictBigDigit = (permissiveMode & JSONParser.BIG_DIGIT_UNRESTRICTED) > 0;
111-
this.finiteJsonDepth = (permissiveMode & JSONParser.FINITE_JSON_DEPTH) > 0;
111+
this.limitJsonDepth = (permissiveMode & JSONParser.LIMIT_JSON_DEPTH) > 0;
112112
}
113113

114114
public void checkControleChar() throws ParseException {
@@ -298,7 +298,7 @@ protected Number parseNumber(String s) throws ParseException {
298298
protected <T> T readArray(JsonReaderI<T> mapper) throws ParseException, IOException {
299299
if (c != '[')
300300
throw new RuntimeException("Internal Error");
301-
if (finiteJsonDepth && ++this.depth > MAX_DEPTH) {
301+
if (limitJsonDepth && ++this.depth > MAX_DEPTH) {
302302
throw new ParseException(pos, ERROR_UNEXPECTED_JSON_DEPTH, c);
303303
}
304304
Object current = mapper.createArray();
@@ -555,7 +555,7 @@ protected <T> T readObject(JsonReaderI<T> mapper) throws ParseException, IOExcep
555555
//
556556
if (c != '{')
557557
throw new RuntimeException("Internal Error");
558-
if (finiteJsonDepth && ++this.depth > MAX_DEPTH) {
558+
if (limitJsonDepth && ++this.depth > MAX_DEPTH) {
559559
throw new ParseException(pos, ERROR_UNEXPECTED_JSON_DEPTH, c);
560560
}
561561
Object current = mapper.createObject();

json-smart/src/test/java/net/minidev/json/test/TestOverflow.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public void shouldNotFailWhenInfiniteJsonDepth() throws Exception {
4646
}
4747
String s = sb.toString();
4848
try {
49-
JSONParser parser = new JSONParser(DEFAULT_PERMISSIVE_MODE & ~JSONParser.FINITE_JSON_DEPTH);
49+
JSONParser parser = new JSONParser(DEFAULT_PERMISSIVE_MODE & ~JSONParser.LIMIT_JSON_DEPTH);
5050
parser.parse(s, JSONValue.defaultReader.DEFAULT);
5151
} catch (ParseException e) {
5252
fail();

0 commit comments

Comments
 (0)