Commit Graph

114 Commits

Author SHA1 Message Date
Simulant c010033591 #863 replace short switch statements with if-else 2024-03-05 22:12:57 +01:00
Simulant 5407423e43 #863 replace usage of back() method in JSONObject parsing 2024-03-05 22:11:24 +01:00
Simulant f38452a00c add a comment explaining the ordering
(cherry picked from commit df0e3e9ab7)
2024-02-25 09:50:26 +01:00
Simulant 4f456d9432 #863 fix changed behaviour of changing order in writeValue with JSONString 2024-02-25 09:42:06 +01:00
Simulant d878c38d40 #863 reorder instanceof checks by assumed frequency 2024-02-24 22:36:14 +01:00
Simulant e2194bc190 #863 undo wrong optimisation, fixing failing test 2024-02-24 21:35:29 +01:00
Simulant 06778bd2d9 #863 compute initial capacity for StringBuilderWriter 2024-02-24 21:21:06 +01:00
Sean Leary 771c82c4eb backing out recent changes to optLong, getLong. See #868 2024-02-24 13:07:51 -06:00
Simulant 7c7a98da71 #863 use StringBuilderWriter to toString methods
resulting in a faster toString generation.
2024-02-23 21:48:25 +01:00
XIAYM b314611230 Merge branch 'stleary:master' into master 2024-02-15 09:51:56 +08:00
XIAYM-gh cb2c8d3962 Revert some unnecessary changes (mentioned in #840) 2024-02-14 17:53:58 +08:00
XIAYM-gh 21a9fae7b0 Try making java 6 & old version javadoc generator compatible 2024-02-13 22:33:30 +08:00
XIAYM-gh 10514e48cb Implemented custom duplicate key handling
- Supports: throw an exception (by default), ignore, overwrite & merge into a JSONArray
 - With tests, 4/4 passed.
2024-02-13 18:56:10 +08:00
Valentyn Kolesnikov 99c84fdf3a Enhanced documentation for Java classes 2024-02-07 14:43:44 +02:00
Thomas Gress 23ac2e7bca improved annotation search performance 2023-12-29 12:28:24 +01:00
sk02241994 7701f21839 Adding comments 2023-12-24 11:39:26 +05:30
sk02241994 abea194120 Adding JSONParserConfiguration for configuring the depth of nested maps 2023-12-22 15:47:55 +05:30
sk02241994 6d811607dd Resolving issue #743
- Recursive depth issue found in JSONObject
- Recursive depth issue found in JSONArray
2023-12-22 15:47:54 +05:30
rudrajyoti biswas 98b79ae7bf #813 - moved number conversion related common changes to utility static method. 2023-10-23 19:16:25 +05:30
rudrajyoti biswas 1d0775cce7 Revert changes with feature and refactor together. 2023-10-19 10:28:11 +05:30
rudrajyoti biswas 7b2677ac5a #790 - Update XML with changes for string to number conversion.
Moved the code logic to a common utility to de-duplicate.
2023-10-14 10:05:36 +05:30
rudrajyoti biswas 56cb5f84c4 #653 - review comments updated. 2023-10-12 11:03:13 +05:30
rudrajyoti biswas 0cdc38ac24 #653 - review comments updated. 2023-10-12 00:53:36 +05:30
Rudrajyoti Biswas d5277b126b Merge branch 'stleary:master' into master 2023-10-11 19:17:21 +00:00
Madjosz c93014cb53 add validity check for JSONObject constructors
* fixes #713
* document JSONException in JavaDoc
* remove unused Comparable<T> boundary to reuse GenericBean in test
2023-10-07 09:38:54 +02:00
rudrajyoti biswas 1a38879c90 #653 - optLong vs getLong inconsistencies
For exponential decimal conversion, number is not touched.
Leading zeros removed from numeric number strings before converting to number.
2023-10-06 21:34:00 +05:30
Sean Leary 79af389f7a Merge pull request #774 from mccartney/removing-synchronized
Removing excessive synchronization
2023-10-04 07:40:10 -05:00
Sean Leary beb2fb5706 Merge pull request #772 from eamonnmcmanus/complexkey
Disallow nested objects and arrays as keys in objects.
2023-10-01 11:04:40 -05:00
Grzegorz Olędzki 61bb60e752 Removing excessive synchronization 2023-09-30 21:36:11 +02:00
Edijs db0fde2a56 Add optJSONArray method to JSONObject with a default value 2023-09-25 20:31:58 +03:00
Éamonn McManus 661114c50d Generalize the logic to disallow nested objects and arrays as keys in objects.
Fixes #771.
2023-09-20 10:50:48 -07:00
Éamonn McManus 2a4bc3420a Apply simplification suggested by @johnjaylward. 2023-08-01 14:38:45 -07:00
Éamonn McManus c8a9e15a57 Don't skip past \0 when parsing JSON objects.
A better solution might be to use -1 instead 0 to represent EOF everywhere,
which of course means changing `char` variables to `int`. The solution here is
enough to solve the immediate problem, though.

Fixes #758.
2023-08-01 13:11:25 -07:00
dburbrid 4951ec48c8 Renamed object methods from ...Obj to ...Object.
Added object method for optDoubleObject (returns Double vice double).
Added similar methods in JSONArray.
Added test methods.
2023-06-29 09:39:34 +01:00
João Farias 0d436d92e2 Removing commented out code 2023-03-02 16:39:11 +01:00
stleary 89f6e7f6a6 Merge branch 'master' into update-copyright 2022-08-26 20:59:00 -05:00
Sean Leary 346fb26f2d Merge pull request #683 from spaffrath/Issue_682_JSONString_similarity
Issue 682 JSONString similarity
2022-08-26 20:57:22 -05:00
stleary 6daabb43ab update-copyright - Replace copyright and license restrictions with Public Domain 2022-08-23 20:00:25 -05:00
stleary e0534b3ec7 initial attempt to test for inconsistent map types in JSONObject 2022-08-20 16:14:34 -05:00
Scott Paffrath 89f16ad0af Issue 682 JSONString similarity 2022-08-05 11:00:33 -07:00
John J. Aylward a642329314 Updates value error messages to be consistent.
Provide both the type and value that failed conversion. Tries not to
"toString" large value types like Arrays or Maps. For those types it
will just output the type and not a value.
2022-03-21 12:48:25 -04:00
John J. Aylward 7a124d857d Add test cases for invalid input 2022-01-26 12:19:53 -05:00
Liam Miller-Cushon 812955e39d Use IdentityHashSet for cycle detection
Fixes https://github.com/stleary/JSON-java/issues/650
2021-11-26 20:07:21 -05:00
Zach 1ffcf3915c successful test 2021-11-17 19:35:53 -06:00
Zach b5bcb68968 added set check logic 2021-11-17 16:57:41 -06:00
Zach 7823d3a4f3 locate the pace for cyclic check 2021-11-17 15:28:01 -06:00
Liam Miller-Cushon 8ca8a80753 Fix some typos 2021-08-25 13:56:44 -07:00
Sean Leary fb71d9d40f Merge pull request #606 from artem-smotrakov/fix-javadoc
Fix javadoc
2021-08-17 20:40:04 -05:00
stleary 2559114dbb Merge branch 'master' into fix-similar-check 2021-07-26 17:53:20 -05:00
John Aylward 579784d73e correct error in converting doubles to big decimals 2021-07-22 23:46:31 -04:00