Backups/JSON-java
1
0
Fork 0
mirror of https://github.com/stleary/JSON-java.git synced 2025-08-04 11:55:31 -04:00
Code Issues Projects Releases Wiki Activity
1,165 Commits 9 Branches 24 Tags
Commit Graph

125 Commits

Author SHA1 Message Date
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
Keaton
7915d8518f
Merge branch 'stleary:master' into feature-disable-whitespace-trim 2024-01-18 09:17:26 +02:00
Sean Leary
55b824d4c4
Merge pull request #846 from stleary/cleanup-and-merge-tests 
Cleanup warnings and merge new unit tests
 2024-01-04 08:52:02 -06:00
Sean Leary
5ddb8c3d35 cleanup-and-merge-tests: fix warnings, set gradlew permissions, enable unchecked warnings in maven 2023-12-30 16:30:19 -06: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
ffd48afa42 Review comments 2023-12-23 10:53:54 +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
Keaton Taylor
4d6de8c00a Remove unused constructor and add comment above other constructor 2023-12-13 14:04:05 +02:00
Keaton Taylor
e430db40aa Update XMLParserConfiguration to not be static and add a comment about the use of shouldTrimWhiteSpace 2023-11-30 10:05:54 +02:00
Aditya Purohit
aba82d9cc4 isNumericChar() - switch comparison order 2023-11-28 02:56:10 +00:00
Keaton Taylor
09f35372d4 Update clone() method so that default constructor does not need to be changed 2023-11-22 11:14:50 +02:00
Keaton Taylor
30f5b2de79 Add a config flag to disable whitespace trimming 2023-11-20 17:50:22 +02:00
Aditya Purohit
7f1cb8bf62 refactor: decompose condition of digit checks by using extra method 'isNumericChar(...)' in NumberConversionUtil. 2023-11-19 09:51:44 -04:00
Aditya Purohit
75419e3f25 refactor: introduce explaining variable 'indentationSuffix' in XML.toString() 2023-11-19 09:21:05 -04:00
Aditya Purohit
097a401f3f refactor: rename variable boolean 'b' to 'isEndOfPair' in CookieList.toString() 2023-11-19 09:11:32 -04:00
Sean Leary
783d298f99
Merge pull request #814 from rudrajyotib/issue813 
Refactor duplicate code for stringToNumber() in JSONObject, JSONArray, and XML
 2023-10-31 17:40:17 -05:00
rudrajyoti biswas
8ec822c575 #748 - PR comments - follow convention of configuration builder. 2023-10-28 07:36:31 +05:30
rudrajyoti biswas
c05d7058ff #748 - javadoc updated for methods. 2023-10-27 17:17:20 +05:30
rudrajyoti biswas
c6ec2f0e4c #748 - close XML tag explicitly for empty tags with configuration. 2023-10-25 23:23:00 +05:30
rudrajyoti biswas
5539722c69 #813 - address PR review comment - brought down visibility. 2023-10-23 23:03:35 +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
04a4c5a3ec
Merge branch 'stleary:master' into master 2023-10-21 12:29:31 +00:00
rudrajyoti biswas
2374766018 #790 - Update XML with changes for string to number conversion. 
For now the code remains duplicated in JSON and XML parsers.
Unit test cases updated to comply with number expectations.
 2023-10-19 14:07:53 +05:30
rudrajyoti biswas
1d0775cce7 Revert changes with feature and refactor together. 2023-10-19 10:28:11 +05:30
theKnightsOfRohan
f074bed732 fix(ParserConfiguration): add <T> params to docs 2023-10-16 17:48:03 -07:00
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
Éamonn McManus
16967f322e Simplify the check for object keys that are themselves objects. 
For object keys, we can just skip the part of `nextValue()` that parses values
that are objects or arrays. Then the existing logic for unquoted values will
already stop at `{` or `[`, and that will produce a `Missing value` exception.
 2023-09-27 12:42:04 -07:00
Edijs
284a316838 Add optJSONArray and optJSONObject methods to JSONArray with a default value 2023-09-27 19:30:45 +03: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
Michael Osipov
133c0cc75f JSONTokener(InputStream) violates rfc8259#section-8.1 (#739) 
Always use UTF-8 when an InputStream is passed.

This fixes #739.
 2023-05-24 11:45:25 +02:00
Sean Leary
8353b9c3f0
Merge pull request #731 from JoaoGFarias/patch-1 
Removing commented out code in JSONObject optDouble()
 2023-03-11 19:28:01 -06:00
HariBabu t
7eca507d13 Removed overriding closable interface. 2023-03-07 13:58:30 +08:00
HariBabu t
e1eabc9c27 JSONTokener implemented java.io.Closeable 2023-03-04 23:08:32 +08:00
João Farias
0d436d92e2
Removing commented out code 2023-03-02 16:39:11 +01:00