Backups/JSON-java
1
0
Fork 0
mirror of https://github.com/stleary/JSON-java.git synced 2025-08-03 11:25:30 -04:00
Code Issues Projects Releases Wiki Activity
997 Commits 9 Branches 24 Tags
Commit Graph

997 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John J. Aylward
4a4b2db8c1 fix for issue #379 2017-11-06 10:28:28 -05:00
John J. Aylward
08d93f3eb5 test cases for issue https://github.com/stleary/JSON-java/issues/379 2017-11-06 10:27:45 -05:00
Sean Leary
f16682bf44
Merge pull request #375 from johnjaylward/FixExceptionWrapping 
fixes wrapped exceptions
 2017-11-02 21:42:29 -05:00
John J. Aylward
18952b5ac0 fixes wrapped exceptions 2017-11-02 22:32:24 -04:00
Sean Leary
bf26eba0d2
Merge pull request #80 from johnjaylward/UnclosedJSONArray 
New test to verify unclosed array
 2017-11-02 20:03:00 -05:00
Sean Leary
d2a66a4287
Merge pull request #373 from johnjaylward/UnclosedJSONArray 
Fixes Unclosed json array stack overflow
 2017-11-02 20:02:26 -05:00
Sean Leary
722003d479
Merge pull request #350 from johnjaylward/AndroidSupport 
Updates for supporting the Android API
 2017-10-30 11:33:10 -05:00
Sean Leary
936db93445
Update README.md 2017-10-30 08:46:43 -05:00
Sean Leary
e0801befe5
Update README.md 2017-10-30 08:45:41 -05:00
Sean Leary
ee3aa03da1
Update README.md 2017-10-30 08:44:21 -05:00
Sean Leary
578a442ef7
Update README.md 2017-10-30 08:43:56 -05:00
John J. Aylward
dfa37a298f Add more tests for unclosed arrays 2017-10-30 08:53:50 -04:00
John J. Aylward
bde6ba1c52 Updates exception expected message 2017-10-30 08:53:50 -04:00
John J. Aylward
52ecc89702 New test to verify unclosed array 2017-10-30 08:53:50 -04:00
John J. Aylward
ed8745cd63 fixes #372. 
Corrects behavior of unclosed arrays
 2017-10-30 08:18:59 -04:00
John J. Aylward
057e0c75ca Merge remote-tracking branch 'origin/master' into AndroidSupport 2017-10-27 13:28:20 -04:00
Sean Leary
cdf3cf7f81 Update README 20171018 2017-10-17 20:05:29 -05:00
Sean Leary
af3b7dc443 Merge pull request #79 from johnjaylward/FixXMLUnescape 
New tests for XML unescaping
 2017-08-27 10:59:36 -05:00
Sean Leary
2565abdaaa Merge pull request #362 from johnjaylward/FixXMLUnescape 
Fixes XML Unescaping
 2017-08-27 10:59:26 -05:00
John J. Aylward
2713f2e2a4 Adds testing for unicode entities 2017-08-19 18:45:53 -04:00
John J. Aylward
de855c50aa Fixes #361. 
* Removes unescape from the XML class calls
* fixes bug with unescape method
* moves unescape logic into the XMLTokener class for more consistency
 2017-08-19 18:23:07 -04:00
John J. Aylward
cb61bbf720 New tests for XML unescaping 2017-08-19 18:19:22 -04:00
Sean Leary
4cb1ae802a Merge pull request #360 from migueltt/tokener-fix 
Creating a JSONObject from a string that contains a duplicate key (any level) throws a JSONException that includes location
 2017-08-17 21:30:01 -05:00
Sean Leary
d0e2cf41a3 Merge pull request #78 from migueltt/tokener-error-message 
Unit tests for constructor JSONObject(JSONTokener)
 2017-08-17 21:29:13 -05:00
Miguel
b90bee0f22 Update error message location (+1) 
`JSONTokener.back()` call removed from `JSONObject(JSONTokener)` constructor.
 2017-08-14 13:05:23 -04:00
Miguel
2e0a8137bd Removed JSONTokener.back() 2017-08-14 13:01:31 -04:00
Miguel
f177c97258 Replacing tabs with 4-spaces 2017-08-10 19:12:41 -04:00
Miguel
68b262914d JSONObject(JSONTokener) now points to last character of duplicate key 
Updating exception message accordingly (position -1)
 2017-08-10 19:06:55 -04:00
Miguel
7d8353401a Adding JSONTokener.back() just before throwing JSONException 
This forces JSONTokener.syntaxError(..) to point to the last character of the duplicate key.
 2017-08-10 19:05:57 -04:00
Miguel
c365e2a774 Remov slf4j reference 2017-08-09 22:03:09 -04:00
Miguel
df466db7b9 Replacing tabs with 4 spaces 2017-08-09 21:59:08 -04:00
Miguel
1acb18091a Remove System.out.println 2017-08-09 21:57:10 -04:00
Miguel
7fed023080 Update to include error location when creating JSONObject from string/text 2017-08-09 21:52:36 -04:00
Miguel
fefd616d73 Unit tests for JSONTokener 2017-08-09 21:51:46 -04:00
Sean Leary
44c3e321b5 Merge pull request #77 from johnjaylward/FixJUnitGradleConfig 
Fixes Gradle config so tests are only run once
 2017-07-20 06:51:14 -05:00
John J. Aylward
f2f6ad3b1f * Fixes Gradle config so tests are only run once 
* Adds missing test to the test suite
 2017-07-19 20:34:59 -04:00
Sean Leary
cf411b3187 Merge pull request #75 from johnjaylward/PopulateMapMoreStrict 
Populate map more strict
 2017-07-19 18:57:55 -05:00
Sean Leary
d9b8507e6a Merge pull request #354 from johnjaylward/PopulateMapMoreStrict 
Updates for populateMap based on discussion in #279 and #264
 2017-07-19 18:57:32 -05:00
Sean Leary
d345bc528e Merge pull request #357 from johnjaylward/WriteJavadocUpdate 
Update javadoc according to issue #356.
 2017-07-15 18:51:18 -05:00
Sean Leary
1aeadd1765 Merge pull request #76 from johnjaylward/WriteJavadocUpdate 
Update test for issue https://github.com/stleary/JSON-java/issues/356
 2017-07-15 18:46:58 -05:00
John J. Aylward
aa562b5ec3 Update test for issue https://github.com/stleary/JSON-java/issues/356 2017-07-15 12:19:02 -04:00
John J. Aylward
6f238a3698 Update javadoc according to issue #356. 2017-07-15 12:17:27 -04:00
John J. Aylward
38d11227ee Adds exception tests 2017-07-09 19:05:00 -04:00
John J. Aylward
4dbc5ef803 fixes malformed javadoc 2017-07-09 18:48:40 -04:00
John J. Aylward
5c80c9157d fixes malformed javadoc 2017-07-09 18:47:09 -04:00
John J. Aylward
e94783f91b Updates javadocs 2017-07-09 18:19:27 -04:00
John J. Aylward
7bc8f41023 Add override of the generic getter to generate a Bridge method. 2017-07-09 18:10:09 -04:00
John J. Aylward
a129ebe8e4 Adds check for resources opened by our bean mapping 2017-07-09 18:09:14 -04:00
John J. Aylward
49117f33dc Adds new tests for testing bean->JSONObject mapping 2017-07-09 17:57:46 -04:00
John J. Aylward
0e3f23d7a1 reorganize classes so test data is separate from test cases 2017-07-09 16:48:01 -04:00