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

Commit graph

  • 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
  • 0150639119 update the new coercion test to use actual values and show the parseDouble method is not robust enough for large numbers John J. Aylward 2017-05-18 11:58:28 -04:00
  • 382f62e781 * Prevent exceptions in cases where the value is not a string. * Don't call toString when we know it's a string, just cast John J. Aylward 2017-05-18 11:41:51 -04:00
  • bdb1163445 Adds conversion tests to ensure downward type coercions are handled sanely John J. Aylward 2017-05-18 11:38:42 -04:00
  • 2867aaa8c8 Updates test cases to support new optFloat and optNumber John J. Aylward 2017-05-17 12:33:59 -04:00
  • 0c7bd725a6 fixes for javadoc John J. Aylward 2017-05-17 11:34:13 -04:00
  • fcdb8671b2 grr, forgot to save changes on last commit John J. Aylward 2017-05-17 11:32:44 -04:00
  • c46774cf13 * Update opt* methods for JSONArray * Add support to JSONArray and JSONObject to optionally get raw number values * Add support to JSONArray and JSONObject to optionally get float values John J. Aylward 2017-05-17 11:29:26 -04:00
  • bd4b180f4e Support for float to BigDecimal in optBigDecimal John J. Aylward 2017-05-17 10:51:06 -04:00
  • 49d47e3ff2 Adjustments to tests for https://github.com/stleary/JSON-java/pull/337/ John J. Aylward 2017-05-16 19:42:46 -04:00
  • a8d4e4734f adjustments to opt methods in reference to https://github.com/stleary/JSON-java/issues/334 John J. Aylward 2017-05-16 19:38:01 -04:00
  • 1d040ec407 fixes errors with tests relating to https://github.com/stleary/JSON-java/pull/336 John J. Aylward 2017-05-16 18:16:07 -04:00
  • 4865f51dd5 change float double literals to be more standard as 1.0f and 1.0d respectively John J. Aylward 2017-05-16 15:38:54 -04:00
  • c870094f69 Fixes spelling in comments and removes compile time warnings John J. Aylward 2017-05-16 15:35:05 -04:00
  • cbd8b18c4a Update README 20170516 Sean Leary 2017-05-16 00:29:00 -05:00
  • c945b53308 Merge pull request #69 from johnjaylward/TestCleanup Sean Leary 2017-04-28 01:04:56 -05:00
  • c233ae709e comment out second unreliable test John J. Aylward 2017-04-27 12:52:02 -04:00
  • 95da4246a2 fix spelling in comment John J. Aylward 2017-04-27 12:48:43 -04:00
  • 9df5d34bbe * Update link in the README to the main JSON-Java repo * Cleans up some warnings * Adds new test for bug https://github.com/stleary/JSON-java/issues/332 * Adds some resource handling for string writers using pre-java1.7 support. I know StringWriters don't need a close method called, but the tests should still handle their resources properly. John J. Aylward 2017-04-27 12:39:42 -04:00
  • f12fa9ba5f Update LICENSE Sean Leary 2017-04-18 08:32:10 -05:00
  • ae1e9e2b6a fix spelling in javadoc comment John J. Aylward 2017-04-03 11:59:36 -04:00
  • f6ab6d7b27 Merge pull request #68 from stleary/jsonpointer-query Sean Leary 2017-03-27 20:05:05 -05:00
  • 80e2ea2a80 Merge pull request #324 from dtalex/JSONPointerOnBeans Sean Leary 2017-03-27 20:04:18 -05:00
  • d1a5f15f0c unit tests for query-by-JSONPointer stleary 2017-03-26 15:03:09 -05:00
  • 82ff14ed8d Merge pull request #66 from stleary/document-unquoted-strings Sean Leary 2017-02-26 11:10:38 -06:00
  • e41972a574 add a test for unquoted values stleary 2017-02-26 11:09:41 -06:00
  • 2917104b53 Allow user to invoke query and optQuery ,with a JSONPointer,directly from JSONArray or JSONObject fix JSONArray alessandro rao 2017-02-25 14:35:02 +01:00
  • 9e0fc5e680 Allow user to invoke query and optQuery ,with a JSONPointer,directly from JSONArray or JSONObject alessandro rao 2017-02-25 13:27:50 +01:00
  • a66abf22a8 Merge pull request #64 from stleary/locale-tests-for-non-EN-keys Sean Leary 2017-02-19 21:34:40 -06:00
  • 724fb888f7 Merge pull request #317 from johnjaylward/fixLocale Sean Leary 2017-02-19 21:34:17 -06:00
  • f41e1d012a tests for locale-independent keys stleary 2017-02-16 20:49:37 -06:00
  • 928179a1f3 locale tests stleary 2017-02-14 08:30:22 -06:00
  • eb806f4c14 make sure locale independent data is not upper/lowercased incorrectly. See #315 John J. Aylward 2017-02-10 10:07:28 -05:00
  • 5ff8b4cb08 Merge pull request #304 from omarzina/master Sean Leary 2016-12-05 08:58:35 -06:00
  • 5ef4f58ef1 [FIX] Update README joumar 2016-12-05 11:55:24 -03:00
  • 413bb53b48 Merge pull request #288 from johnjaylward/XmlEscape Sean Leary 2016-11-24 10:01:14 -06:00
  • df9c27c53f Merge pull request #62 from erosb/master Sean Leary 2016-10-08 10:07:53 -05:00
  • 237376eca6 Merge pull request #292 from erosb/master Sean Leary 2016-10-08 10:07:31 -05:00
  • 97e3d6c7ce testcase for stleary/JSON-java#292 and adding .idea to .gitiignore Bence Erős 2016-10-05 14:59:36 +02:00
  • e0616a129e fixing #291 Bence Erős 2016-10-05 14:57:42 +02:00
  • 93ffca36c3 fixes spacing John J. Aylward 2016-09-28 20:23:30 -04:00
  • e477d7002b fixes object comparison John J. Aylward 2016-09-28 20:22:12 -04:00
  • fb1db9341e Changes encoding to better match the XML spec section 2.2 John J. Aylward 2016-09-28 20:15:58 -04:00
  • adb0478f66 properly unescape tokens in JSONML for reversability. John J. Aylward 2016-09-22 16:23:09 -04:00
  • f6a00e94c7 adds test for unicode that has surrogate pairs John J. Aylward 2016-09-22 16:12:00 -04:00
  • f58a0f4684 fixes code point appends to string builder John J. Aylward 2016-09-22 16:10:49 -04:00
  • c11e09959c Fixes code point output when unescaping code points. XML escapes are an entire code point, not surrogate pairs like in JSON. John J. Aylward 2016-09-22 15:40:26 -04:00
  • 68f92eb395 Adds more javadoc. John J. Aylward 2016-09-22 14:40:39 -04:00
  • 2b87f334d0 Update test cases to support ISO Control encoding changes. John J. Aylward 2016-09-22 14:13:48 -04:00
  • 34652a8706 Updates to iterate on code points instead of characters and changes the encoding to only encode control characters as defined by ISO standard. John J. Aylward 2016-09-22 14:13:14 -04:00
  • 5027a283c1 Adds test for escaping from a JSONObject to XML John J. Aylward 2016-09-22 13:09:32 -04:00
  • c8563ff93d new test case for XML changes John J. Aylward 2016-09-22 12:38:30 -04:00
  • a2d3b59394 Implements unicode escaping similar to JSONObject. John J. Aylward 2016-09-22 12:38:06 -04:00
  • 474711c4ea Merge pull request #60 from stleary/fix-number-tests Sean Leary 2016-09-15 21:38:36 -05:00
  • 58aebaa14f fixed merge issues stleary 2016-09-15 21:31:28 -05:00
  • c24be0e4ea Merge pull request #274 from johnjaylward/NumberOutputFix Sean Leary 2016-09-09 11:42:35 -05:00
  • 88f65c5bea Merge branch 'master' of github.com:stleary/JSON-java into NumberOutputFix John J. Aylward 2016-08-26 11:32:35 -04:00
  • 3570890be7 Merge pull request #57 from johnjaylward/EnumCleanup Sean Leary 2016-08-19 11:43:20 -05:00
  • ebe69df8e4 Merge pull request #271 from johnjaylward/EnumCleanup Sean Leary 2016-08-19 10:28:04 -05:00
  • 59761f6f64 Merge pull request #58 from johnjaylward/SimplifyNumberWrap Sean Leary 2016-08-17 12:12:32 -05:00
  • 2f2cd4dfc5 Fix for number output bug. John J. Aylward 2016-08-17 12:52:04 -04:00
  • 0b1dbe9369 fixes test to not depend on key order John J. Aylward 2016-08-17 12:13:54 -04:00
  • a66b97f60b fix test John J. Aylward 2016-08-17 11:31:12 -04:00
  • cbd0418704 Update JSONObjectTest.java johnjaylward 2016-08-16 21:33:54 -04:00