Commit Graph

  • dba4afd0cf Adding maven repo badge Felix Leipold 2017-11-14 16:51:14 +01:00
  • 26160e1619 Remove trailing whitespace Felix Leipold 2017-11-14 17:01:22 +01:00
  • b7e2eee4d6 Renaming README to README.md Felix Leipold 2017-11-14 16:52:03 +01:00
  • 77d142d494 Merge pull request #81 from johnjaylward/FixFalsePositiveSimilar Sean Leary 2017-11-11 16:12:26 -06:00
  • 28e09dc493 Merge pull request #380 from johnjaylward/FixFalsePositiveSimilar Sean Leary 2017-11-11 16:12:06 -06:00
  • dae88d7c5c fix method names John J. Aylward 2017-11-06 10:35:49 -05:00
  • 4a4b2db8c1 fix for issue #379 John J. Aylward 2017-11-06 10:28:28 -05:00
  • 08d93f3eb5 test cases for issue https://github.com/stleary/JSON-java/issues/379 John J. Aylward 2017-11-06 10:27:45 -05:00
  • f16682bf44 Merge pull request #375 from johnjaylward/FixExceptionWrapping Sean Leary 2017-11-02 21:42:29 -05:00
  • 18952b5ac0 fixes wrapped exceptions John J. Aylward 2017-11-02 22:32:24 -04:00
  • bf26eba0d2 Merge pull request #80 from johnjaylward/UnclosedJSONArray Sean Leary 2017-11-02 20:03:00 -05:00
  • d2a66a4287 Merge pull request #373 from johnjaylward/UnclosedJSONArray Sean Leary 2017-11-02 20:02:26 -05:00
  • 722003d479 Merge pull request #350 from johnjaylward/AndroidSupport Sean Leary 2017-10-30 11:33:10 -05:00
  • 936db93445 Update README.md Sean Leary 2017-10-30 08:46:43 -05:00
  • e0801befe5 Update README.md Sean Leary 2017-10-30 08:45:41 -05:00
  • ee3aa03da1 Update README.md Sean Leary 2017-10-30 08:44:21 -05:00
  • 578a442ef7 Update README.md Sean Leary 2017-10-30 08:43:56 -05:00
  • dfa37a298f Add more tests for unclosed arrays John J. Aylward 2017-10-30 08:09:42 -04:00
  • bde6ba1c52 Updates exception expected message John J. Aylward 2017-10-30 07:41:11 -04:00
  • 52ecc89702 New test to verify unclosed array John J. Aylward 2017-10-30 07:27:42 -04:00
  • ed8745cd63 fixes #372. Corrects behavior of unclosed arrays John J. Aylward 2017-10-30 08:10:06 -04:00
  • 057e0c75ca Merge remote-tracking branch 'origin/master' into AndroidSupport John J. Aylward 2017-10-27 13:28:20 -04:00
  • cdf3cf7f81 Update README Sean Leary 2017-10-17 20:05:29 -05:00
  • af3b7dc443 Merge pull request #79 from johnjaylward/FixXMLUnescape Sean Leary 2017-08-27 10:59:36 -05:00
  • 2565abdaaa Merge pull request #362 from johnjaylward/FixXMLUnescape Sean Leary 2017-08-27 10:59:26 -05:00
  • 2713f2e2a4 Adds testing for unicode entities John J. Aylward 2017-08-19 18:45:53 -04:00
  • 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 John J. Aylward 2017-08-19 18:21:56 -04:00
  • cb61bbf720 New tests for XML unescaping John J. Aylward 2017-08-19 18:19:22 -04:00
  • 4cb1ae802a Merge pull request #360 from migueltt/tokener-fix Sean Leary 2017-08-17 21:30:01 -05:00
  • d0e2cf41a3 Merge pull request #78 from migueltt/tokener-error-message Sean Leary 2017-08-17 21:29:13 -05:00
  • b90bee0f22 Update error message location (+1) Miguel 2017-08-14 13:05:23 -04:00
  • 2e0a8137bd Removed JSONTokener.back() Miguel 2017-08-14 13:01:31 -04:00
  • f177c97258 Replacing tabs with 4-spaces Miguel 2017-08-10 19:12:41 -04:00
  • 68b262914d JSONObject(JSONTokener) now points to last character of duplicate key Miguel 2017-08-10 19:06:55 -04:00
  • 7d8353401a Adding JSONTokener.back() just before throwing JSONException Miguel 2017-08-10 19:05:57 -04:00
  • c365e2a774 Remov slf4j reference Miguel 2017-08-09 22:03:09 -04:00
  • df466db7b9 Replacing tabs with 4 spaces Miguel 2017-08-09 21:59:08 -04:00
  • 1acb18091a Remove System.out.println Miguel 2017-08-09 21:57:10 -04:00
  • 7fed023080 Update to include error location when creating JSONObject from string/text Miguel 2017-08-09 21:52:36 -04:00
  • fefd616d73 Unit tests for JSONTokener Miguel 2017-08-09 21:51:46 -04:00
  • 44c3e321b5 Merge pull request #77 from johnjaylward/FixJUnitGradleConfig Sean Leary 2017-07-20 06:51:14 -05:00
  • f2f6ad3b1f * Fixes Gradle config so tests are only run once * Adds missing test to the test suite John J. Aylward 2017-07-19 20:34:59 -04:00
  • cf411b3187 Merge pull request #75 from johnjaylward/PopulateMapMoreStrict Sean Leary 2017-07-19 18:57:55 -05:00
  • d9b8507e6a Merge pull request #354 from johnjaylward/PopulateMapMoreStrict Sean Leary 2017-07-19 18:57:32 -05:00
  • d345bc528e Merge pull request #357 from johnjaylward/WriteJavadocUpdate Sean Leary 2017-07-15 18:51:18 -05:00
  • 1aeadd1765 Merge pull request #76 from johnjaylward/WriteJavadocUpdate Sean Leary 2017-07-15 18:46:58 -05:00
  • aa562b5ec3 Update test for issue https://github.com/stleary/JSON-java/issues/356 John J. Aylward 2017-07-15 12:19:02 -04:00
  • 6f238a3698 Update javadoc according to issue #356. John J. Aylward 2017-07-15 12:17:27 -04:00
  • 38d11227ee Adds exception tests John J. Aylward 2017-07-09 19:05:00 -04:00
  • 4dbc5ef803 fixes malformed javadoc John J. Aylward 2017-07-09 18:48:40 -04:00
  • 5c80c9157d fixes malformed javadoc John J. Aylward 2017-07-09 18:47:09 -04:00
  • e94783f91b Updates javadocs John J. Aylward 2017-07-09 18:19:27 -04:00
  • 7bc8f41023 Add override of the generic getter to generate a Bridge method. John J. Aylward 2017-07-09 18:07:11 -04:00
  • a129ebe8e4 Adds check for resources opened by our bean mapping John J. Aylward 2017-07-09 17:36:36 -04:00
  • 49117f33dc Adds new tests for testing bean->JSONObject mapping John J. Aylward 2017-07-09 17:35:46 -04:00
  • 0e3f23d7a1 reorganize classes so test data is separate from test cases John J. Aylward 2017-07-09 16:33:39 -04:00
  • 641b68dd55 updates javadoc. John J. Aylward 2017-07-07 21:15:11 -04:00
  • 643b25140f Updates for populateMap based on discussion in #279 and #264 John J. Aylward 2017-07-07 20:48:42 -04:00
  • 3997a90d58 update constructor call to match Android implementation John J. Aylward 2017-07-07 12:24:27 -04:00
  • 1736a60ffe adds comment for the API change John J. Aylward 2017-06-21 12:22:23 -04:00
  • e8b1b66888 Updates for supporting the Android API John J. Aylward 2017-06-21 11:52:15 -04:00
  • 974a5f7d5d Merge pull request #74 from johnjaylward/AndroidSupport Sean Leary 2017-07-06 18:08:20 -05:00
  • 5024f2d210 Merge pull request #352 from johnjaylward/ErrorMessagePositionFixes Sean Leary 2017-07-06 18:07:50 -05:00
  • 16baa323cf adds comments John J. Aylward 2017-06-26 10:32:02 -04:00
  • 52845366bd Fixes more position errors from stepping to new lines and then back. John J. Aylward 2017-06-23 23:27:28 -04:00
  • 899cf528df More test cases for position information John J. Aylward 2017-06-24 13:10:14 -04:00
  • 47ff774f5c Updates test coverage table John J. Aylward 2017-06-23 23:55:22 -04:00
  • af39376d92 more fixes for testing postition information John J. Aylward 2017-06-23 23:25:11 -04:00
  • e7e6ed9205 Fixes position reports on errors John J. Aylward 2017-06-23 13:40:41 -04:00
  • 0e612ba8a4 More test corrections for correct position reports in error messages John J. Aylward 2017-06-21 19:56:00 -04:00
  • 971614ac8b fix expected exception message John J. Aylward 2017-06-21 18:28:04 -04:00
  • 3081b4bd96 Fixes for failing tests due to android integration John J. Aylward 2017-06-21 14:59:42 -04:00
  • 1add1247fa Merge pull request #348 from johnjaylward/ArrayPerformance Sean Leary 2017-06-12 02:05:26 -05:00
  • 5b2e5e7579 Merge pull request #347 from ttulka/master Sean Leary 2017-06-11 23:32:06 -05:00
  • 441fec7498 Merge pull request #73 from johnjaylward/BetterErrorHandling Sean Leary 2017-06-11 14:12:56 -05:00
  • c9ae1f17d7 Merge pull request #345 from johnjaylward/BetterErrorHandling Sean Leary 2017-06-11 14:12:48 -05:00
  • 246350bbcd comment added to explain the reason that JSON object is unordered Tomas Tulka 2017-06-09 09:00:17 +02:00
  • 2fbe4d96cf change JSONObject(Map) constructor to use the default capacity when a null map is passed John J. Aylward 2017-06-08 12:18:04 -04:00
  • 3645f91b55 change JSONArray(Collection) constructor to use the default capacity when a null collection is passed John J. Aylward 2017-06-08 12:15:03 -04:00
  • 9c092753b0 * Updates array constructor and bulk operations to best guess capacity information * Update JSONObject to allow best guess for initial capacity. John J. Aylward 2017-06-08 11:22:23 -04:00
  • c5e4b91fa4 Updates tests for better error handling changes John J. Aylward 2017-06-08 02:25:59 -04:00
  • d0f5607998 a comment added to explain the use of HashMap Tomas Tulka 2017-06-08 08:03:14 +02:00
  • ad6bdd715d Adds JSONException for write value errors so serialization errors can be tracked easier John J. Aylward 2017-06-05 20:51:57 -04:00
  • ef7a5e40be Merge pull request #341 from johnjaylward/OptimizeLoops Sean Leary 2017-05-31 20:51:20 -05:00
  • 237bf0adb6 more comments John J. Aylward 2017-05-31 18:31:02 -04:00
  • f76fbe7005 fixes comments John J. Aylward 2017-05-31 18:13:40 -04:00
  • 4f5bf16676 * Adds protected entrySet accessor to JSONObject * Updates loops that request key/value pairs to use the new entrySet accessor John J. Aylward 2017-05-22 00:50:39 -04:00
  • 93ca7b176f Merge pull request #71 from johnjaylward/OptimizeOpt Sean Leary 2017-05-22 22:59:37 -05:00
  • fbd2be7431 Merge pull request #337 from johnjaylward/OptimizeOpt Sean Leary 2017-05-22 22:59:04 -05:00
  • 757b6edb03 Merge branch 'master' of github.com:stleary/JSON-java into OptimizeOpt John J. Aylward 2017-05-21 13:12:24 -04:00
  • f5d3086c55 Merge pull request #70 from johnjaylward/fixSpelling Sean Leary 2017-05-20 12:37:58 -05:00
  • f2b642a1ca Merge pull request #336 from johnjaylward/fixSpelling Sean Leary 2017-05-20 12:37:31 -05:00
  • 04d76b638b split out tests for better readability John J. Aylward 2017-05-19 15:01:37 -04:00
  • 04d6e83fc2 * Missed JSONArray optFloat and optDouble for the revert * prevents erasure of stack trace for rethrown exceptions John J. Aylward 2017-05-19 09:49:22 -04:00
  • 849b392c01 updates the getNumber/optNumber to not return invalid Doubles John J. Aylward 2017-05-18 19:49:50 -04:00
  • a7f8ff24df correct string check for JSONObject optBigDecimal and optBigInteger John J. Aylward 2017-05-18 14:41:42 -04:00
  • cfe6851d8c Adds testing for -0 with optNumber John J. Aylward 2017-05-18 14:25:42 -04:00
  • 1ab5260a7a * Adds methods getNUmber and getFloat to JSONArray and JSONObject * Extracts the stringToNumber logic that the optNumber method uses to reuse it between classes * Fixes -0 issue with optNumber/getNumber John J. Aylward 2017-05-18 14:24:34 -04:00
  • c28a2bdf39 * reverts changes to getDouble and related optDouble and optFloat * Updates optNumber to be smarter about which object it uses to parse strings John J. Aylward 2017-05-18 13:07:32 -04:00
  • 1967bee236 expands the coercion tests a little more John J. Aylward 2017-05-18 12:11:43 -04:00