1
0
Fork 0
mirror of https://github.com/ethauvin/JSON-java.git synced 2025-06-17 07:50:52 -07:00

Commit graph

  • 7cad4c3b26 partially revert changes Andrei Paikin 2018-05-25 22:17:03 +03:00
  • 05074386d3 change length comparison to isEmpty method Andrei_Paikin 2018-05-21 16:58:13 +03:00
  • a490ebdb78 add isEmpty and isNotEmpty methods Andrei Paikin 2018-05-19 09:42:21 +03:00
  • 3c1535d724
    Merge pull request #417 from stleary/fix-double-ctor Sean Leary 2018-05-16 08:46:01 -05:00
  • a6284df9c7 initial commit fix-double-ctor stleary 2018-05-02 20:28:45 -05:00
  • 20d90bfb0b
    Merge pull request #85 from johnjaylward/JSONPointerTrailingSlash Sean Leary 2018-03-27 07:45:17 -05:00
  • bfb300835f
    Merge pull request #411 from johnjaylward/JSONPointerTrailingSlash Sean Leary 2018-03-27 07:44:48 -05:00
  • ca9df04539 Initial implementation of XMLParserConfig object for more flexible XML parsing John J. Aylward 2018-03-21 21:47:21 -04:00
  • 3fe4a767e6 Fixes incorrect syntax for JSONPointer in test. John J. Aylward 2018-03-20 22:15:25 -04:00
  • 06e9ad280f
    Merge pull request #403 from paulpolushkin/idea-fix Sean Leary 2018-03-19 19:10:29 -05:00
  • 2362c930d1 Fixes #410. Invalid processing of trailing / for JSON Pointer John J. Aylward 2018-03-19 09:33:09 -04:00
  • 43f3f5e80b Add another test John J. Aylward 2018-03-19 09:48:50 -04:00
  • f4201cf318 Test cases for issue described in https://github.com/stleary/JSON-java/issues/410. John J. Aylward 2018-03-19 09:34:13 -04:00
  • 770cb9c4e5
    Merge pull request #84 from johnjaylward/FixBeanKeyNameing Sean Leary 2018-03-14 21:19:11 -05:00
  • 2a6b5bacc5
    Merge pull request #406 from johnjaylward/FixBeanKeyNameing Sean Leary 2018-03-14 21:18:23 -05:00
  • a509a28ed4 Cleans up the name check a little to be more permissive on what can be tagged with the new JSONPropertyName annotation. Also updates the javadoc to reflect the new name allowances John J. Aylward 2018-03-11 16:59:34 -04:00
  • 37f1f4c8ca
    Merge pull request #83 from johnjaylward/FixNPE Sean Leary 2018-03-11 15:59:21 -05:00
  • 1c1ef5b211
    Merge pull request #405 from johnjaylward/FixNPE Sean Leary 2018-03-11 15:57:23 -05:00
  • 193a3823b5 new test cases to support bean annotation John J. Aylward 2018-03-07 14:52:50 -05:00
  • 74b9a60f98 Adds annotation to support custom field names during Bean serialization John J. Aylward 2018-03-07 14:51:37 -05:00
  • b63b976acb Updates javadoc to match actual exceptions thrown. Also optimizes some boxing statements and returns. John J. Aylward 2018-03-07 12:14:32 -05:00
  • aa5e80bc8d add test cases for null keys John J. Aylward 2018-03-07 12:11:17 -05:00
  • 97e180444d ignore Intellij Idea project files Pavel Polushkin 2018-02-25 13:08:58 +03:00
  • d402a99fd8
    Merge pull request #400 from foldvari/master Sean Leary 2018-02-10 11:09:26 -06:00
  • 7073bc8c47 XML toJSONObject(Readre reader) György Földvári 2018-02-04 18:43:35 +01:00
  • fc881e2631
    Merge pull request #82 from billdeng/master Sean Leary 2018-02-02 23:56:36 -06:00
  • cc2ed79e57 Correct the message to match the function dengjianbao 2018-02-02 22:54:08 +08:00
  • 61cdfefc36
    Update README.md 20180130 Sean Leary 2018-01-30 19:46:24 -06:00
  • fbad2d0017
    Merge pull request #392 from philippgille/patch-1 Sean Leary 2018-01-20 03:39:07 -06:00
  • 15719886f7
    Remove wrong apostrophe Philipp Gillé 2018-01-17 18:41:48 +01:00
  • ca45b02ffc
    Merge pull request #381 from fleipold/maven-badge Sean Leary 2018-01-14 10:18:46 -06:00
  • b6efbabc32 Making links markdown links Felix Leipold 2017-11-17 12:46:01 +01:00
  • 9eb8c27724 Marking up class and method names as inline code Felix Leipold 2017-11-17 12:33:50 +01:00
  • 195963357c Make file names bold Felix Leipold 2017-11-17 12:24:17 +01:00
  • 28efdb4860 Moving Badge below title Felix Leipold 2017-11-17 12:24:03 +01:00
  • c88653ca2e History with fixed font Felix Leipold 2017-11-14 17:16:51 +01:00
  • b3068d9fe4 Marking file and class names with single quotes Felix Leipold 2017-11-14 17:05:27 +01:00
  • 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 20171018 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