Backups/JSON-java
1
0
Fork 0
mirror of https://github.com/stleary/JSON-java.git synced 2026-04-24 00:03:14 -04:00
Code Issues Projects Releases Wiki Activity
918 Commits 11 Branches 25 Tags
e638955034b4c95849fe3f9ef144b4f8ecaea663
Commit Graph

918 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
John J. Aylward 641b68dd55 updates javadoc. 2017-07-07 21:33:46 -04:00
John J. Aylward 643b25140f Updates for populateMap based on discussion in #279 and #264 2017-07-07 20:48:42 -04:00
John J. Aylward 3997a90d58 update constructor call to match Android implementation 2017-07-07 12:24:27 -04:00
John J. Aylward 1736a60ffe adds comment for the API change 2017-07-07 12:17:45 -04:00
John J. Aylward e8b1b66888 Updates for supporting the Android API 2017-07-07 12:17:39 -04:00
Sean Leary 974a5f7d5d Merge pull request #74 from johnjaylward/AndroidSupport 
Correct expected position information in error messages
 2017-07-06 18:08:20 -05:00
Sean Leary 5024f2d210 Merge pull request #352 from johnjaylward/ErrorMessagePositionFixes 
Error message position fixes
 2017-07-06 18:07:50 -05:00
John J. Aylward 16baa323cf adds comments 2017-07-03 13:03:02 -04:00
John J. Aylward 52845366bd Fixes more position errors from stepping to new lines and then back. 2017-07-03 13:03:02 -04:00
John J. Aylward 899cf528df More test cases for position information 2017-06-24 13:10:14 -04:00
John J. Aylward 47ff774f5c Updates test coverage table 2017-06-23 23:55:22 -04:00
John J. Aylward af39376d92 more fixes for testing postition information 2017-06-23 23:25:11 -04:00
John J. Aylward e7e6ed9205 Fixes position reports on errors 2017-06-23 13:40:41 -04:00
John J. Aylward 0e612ba8a4 More test corrections for correct position reports in error messages 2017-06-21 19:56:00 -04:00
John J. Aylward 971614ac8b fix expected exception message 2017-06-21 18:28:04 -04:00
John J. Aylward 3081b4bd96 Fixes for failing tests due to android integration 2017-06-21 14:59:42 -04:00
Sean Leary 1add1247fa Merge pull request #348 from johnjaylward/ArrayPerformance 
Capacity improvements for internal structures
 2017-06-12 02:05:26 -05:00
Sean Leary 5b2e5e7579 Merge pull request #347 from ttulka/master 
a comment added to explain the use of HashMap
 2017-06-11 23:32:06 -05:00
Sean Leary 441fec7498 Merge pull request #73 from johnjaylward/BetterErrorHandling 
Updates tests for better error handling changes
 2017-06-11 14:12:56 -05:00
Sean Leary c9ae1f17d7 Merge pull request #345 from johnjaylward/BetterErrorHandling 
Adds JSONException for write value errors
 2017-06-11 14:12:48 -05:00
Tomas Tulka 246350bbcd comment added to explain the reason that JSON object is unordered 
to avoid implementators' misconceptions and tries to reimplement the
JSON object to keep the elements order
 2017-06-09 09:00:17 +02:00
John J. Aylward 2fbe4d96cf change JSONObject(Map) constructor to use the default capacity when a null map is passed 2017-06-08 12:18:04 -04:00
John J. Aylward 3645f91b55 change JSONArray(Collection) constructor to use the default capacity when a null collection is passed 2017-06-08 12:15:03 -04:00
John J. Aylward 9c092753b0 * Updates array constructor and bulk operations to best guess capacity information 
* Update JSONObject to allow best guess for initial capacity.
 2017-06-08 11:22:23 -04:00
John J. Aylward c5e4b91fa4 Updates tests for better error handling changes 2017-06-08 02:25:59 -04:00
Tomas Tulka d0f5607998 a comment added to explain the use of HashMap 
to avoid misconception of contributors about using HashMap to implement
a JSON object as a unordered collection by the definition
 2017-06-08 08:03:14 +02:00
John J. Aylward ad6bdd715d Adds JSONException for write value errors so serialization errors can be tracked easier 2017-06-05 20:51:57 -04:00
Sean Leary ef7a5e40be Merge pull request #341 from johnjaylward/OptimizeLoops 
Sorry for the late merge, somehow lost track of this pull request.
 2017-05-31 20:51:20 -05:00
John J. Aylward 237bf0adb6 more comments 2017-05-31 18:31:02 -04:00