erik/JSON-java
erik/JSON-java
1
0
Fork 0
mirror of https://github.com/ethauvin/JSON-java.git synced 2025-06-17 16:00:51 -07:00
Code Releases Activity
758 commits 11 branches 11 tags 1.9 MiB
Commit graph

758 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nicholas Cull
c3ba4bdbe5 Nesting depth test works as expected. 2016-07-23 19:12:51 +10:00
Nils Faupel
3890bfae52 reduce the use of unnecessary exceptions 2016-07-19 19:59:30 +02:00
Nils Faupel
abf2963bbe Revert "reduces the use of unnecessary exceptions" 
This reverts commit 7627d40d10.
 2016-07-19 19:00:42 +02:00
John J. Aylward
215321cd28 updates Test cases to support new JSONML and XML conversion options 2016-07-18 15:04:03 -04:00
John J. Aylward
09d37e59b8 Cleans up the JSONML changes and adds similar changes to the XML class 2016-07-18 14:42:21 -04:00
John J. Aylward
93704371bb Updates to the Javadoc for exceptions 2016-07-18 14:12:06 -04:00
Jakob Stemberger
42e0944708 Brings in changes from PR #70 to be updated to HEAD 2016-07-18 13:45:31 -04:00
Sean Leary
71c1eba1e7 Merge pull request #51 from johnjaylward/VerifyOptConversions 
Verify opt method conversions for JSONArray and JSONObject
 2016-07-08 22:31:48 -05:00
John J. Aylward
c2de224711 Verify opt method conversions for JSONArray and JSONObject 2016-07-08 16:58:58 -04:00
Simulant
7627d40d10 reduces the use of unnecessary exceptions 2016-07-08 22:17:05 +02:00
Sean Leary
04181fb6e2 Merge pull request #246 from johnjaylward/LicenseFile 
Add License file
 2016-07-02 13:20:54 -05:00
Sean Leary
239e0b7070 Merge pull request #242 from johnjaylward/issue240 
Fixes Issue #240
 2016-07-02 13:20:21 -05:00
johnjaylward
a8a71898a3 Create LICENSE 2016-06-22 14:49:52 -04:00
johnjaylward
86e8f7b313 Update README 
fixes typo
 2016-06-17 16:39:11 -04:00
Sean Leary
01af31718e Merge pull request #50 from johnjaylward/issue240 
Tests for Issue #240 in JSON-Java
 2016-06-17 09:36:42 -05:00
John J. Aylward
1204ea9dcf fixes a typo 2016-06-17 00:04:27 -04:00
John J. Aylward
c5deff636b updates README for new project layout 2016-06-16 23:59:34 -04:00
John J. Aylward
46a1c9acf9 Adds test case to confirm the parsing of control characters 2016-06-16 13:02:08 -04:00
John J. Aylward
42791ab12d Updates README to note that the parser does allow some invalid JSON 2016-06-16 13:01:22 -04:00
John J. Aylward
80f9e48e64 Moves src folder to simplify build.gradle configuration. If JSON-Java source is merged, it's src fold would now be src/main/java/org.json/ instead of src/main/org.json as well. 2016-06-16 12:20:54 -04:00
johnjaylward
0e0f3f2167 Merge pull request #1 from stleary/master 
update from origin
 2016-06-16 11:44:09 -04:00
johnjaylward
b3abaa5b4c Merge pull request #1 from stleary/master 
update from origin
 2016-06-16 11:43:05 -04:00
Sean Leary
40f170b508 Merge pull request #49 from madsager/master 
Add test that an invalid escape sequence results in a JSONException a…
 2016-06-07 21:29:25 -05:00
Sean Leary
eb569b58fc Merge pull request #236 from madsager/master 
Make nextString throw a JSONException instead of a NumberFormatExcept…
 2016-06-07 21:29:02 -05:00
Mads Ager
c7fdada0fd Add test that an invalid escape sequence results in a JSONException and not a NumberFormatException. 2016-06-02 16:41:43 +02:00
Mads Ager
16a86d73df Pass in the throwable that caused the error. 2016-06-02 16:11:15 +02:00
Mads Ager
dfa651e777 Make nextString throw a JSONException instead of a NumberFormatException for malformed input. 2016-06-02 15:56:48 +02:00
Sean Leary
51bcbebaa8 Merge pull request #48 from erosb/master 
unittests for stleary/JSON-Java#233
 2016-05-20 21:12:12 -05:00
Sean Leary
612dafc750 Update JSONObject.java 2016-05-20 21:10:17 -05:00
Sean Leary
808320801a Update JSONArray.java 
Update version timestamp
 2016-05-20 21:09:53 -05:00
Sean Leary
b2bde1f468 Merge pull request #234 from erosb/master 
fixing stleary/JSON-Java#233
 2016-05-20 21:03:06 -05:00
Bence Erős
a1893ebc02 unittests for stlear/JSON-Java#233 2016-05-16 14:54:01 +02:00
Bence Erős
56be31e7a8 fixing stleary/JSON-Java#233 2016-05-16 14:53:34 +02:00
stleary
8ed0362683 convert remaining JsonPath expressions to JSONPointer 2016-05-14 13:38:46 -05:00
stleary
15f48a0500 convert tests to use JSONPointer where practical 2016-05-14 11:59:24 -05:00
stleary
9a81b40334 added some JavaDocs 2016-05-14 11:09:51 -05:00
stleary
45cbc66f5b add coverage for JSONObject, JSONArray queryFrom() 2016-05-14 09:26:03 -05:00
stleary
4a458a9f1c add timestamps to recent commits, javadocs for JSONObject, JSONArray queryFrom() methods 2016-05-14 09:22:18 -05:00
stleary
06ae87c456 exclude resources from test 2016-05-13 23:22:54 -05:00
Sean Leary
7038ea884e Merge pull request #47 from stleary/add-to-test-suite-and-fix-resource 
add JSONPointerTest to test suite, fix resource for gradle build
 2016-05-13 23:17:10 -05:00
stleary
0112d82755 add JSONPointerTest to test suite, fix resource for gradle build 2016-05-13 23:13:06 -05:00
Sean Leary
46044bfc51 Merge pull request #46 from erosb/master 
Tests for JSON Pointers
 2016-05-13 22:47:14 -05:00
Sean Leary
8a72509e6e Merge pull request #222 from erosb/master 
JSON Pointer implementation
 2016-05-13 22:46:52 -05:00
Sean Leary
a9ff159c78 Update README.md 2016-05-13 15:17:22 -05:00
Sean Leary
b843d67a92 Update README.md 2016-05-07 07:03:50 -05:00
Sean Leary
691734f342 Update README.md 2016-05-07 07:03:30 -05:00
Sean Leary
ccc7a7af29 Update README.md 2016-05-07 07:02:50 -05:00
Bence Erős
adb3118d31 added test for checking if the JSONPointer is immutable 2016-05-05 16:00:15 +02:00
Bence Erős
c044eb14dd added copying to JSONPointer constructor 2016-05-05 15:59:43 +02:00
Bence Erős
2eed4be5fc one more test for null-check in Builder#append(String) 2016-05-03 23:42:26 +02:00