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

870 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sean Leary
143db39d27
Merge pull request #604 from ianlovejoy/master 
Fixed incorrect cast getting float from array
 2021-05-01 08:50:54 -05:00
Ian Lovejoy
75894086e5 Fixed incorrect cast getting float from array 
Added test for getting float from array
 2021-04-27 19:03:35 -07:00
Sean Leary
fa46da45f4
Merge pull request #601 from AISS-2021-L5-G02/master 
Added some examples for new-comers in a Markdown file
 2021-04-21 00:31:12 -05:00
TheNeoStormZ
f912e5d1c4
Merge pull request #2 from TheNeoStormZ/master 
Changed JSONExamples to a Markdown file (and another place) with mino…
 2021-04-02 19:31:42 +02:00
Pablo Marín Gómez
6bf3d38889 Changed JSONExamples to a Markdown file (and another place) with minor tweaks 2021-04-02 19:28:37 +02:00
TheNeoStormZ
c62df81b3e
Merge pull request #1 from TheNeoStormZ/master 
Added some examples for new-comers
 2021-04-02 11:28:25 +02:00
Pablo Marín Gómez
e1f69ff3fe Added some examples for new-comers 2021-04-02 11:25:57 +02:00
Sean Leary
50d619698f
Merge pull request #594 from anton0xf/patch-1 
JSONStringer.java: fix max nesting level in javadoc
 2021-03-18 19:42:49 -05:00
anton0xf
29103e3228
JSONStringer.java: fix max nesting level in javadoc 2021-03-14 22:45:38 +05:00
Sean Leary
2630676f36
Update README.md 2021-03-09 19:54:54 -06:00
Sean Leary
7299b201f4
Update pom.xml 20210307 2021-03-07 21:11:48 -06:00
Sean Leary
8cc1e9830d
Update README.md 2021-03-07 21:09:01 -06:00
Sean Leary
c43e21ae73
Merge pull request #588 from fossterer/563-jsonpointer-do-not-encode-quotes 
JSONPointer should not process reverse solidus or double-quote chars in tokens
 2021-03-06 10:00:32 -06:00
Shashank Sabniveesu
d6ccc64c79 Closes 563: As never defined in RFC 6901 Section 3, do not handle backslashes (\) and quotes(") as anything special 2021-02-28 16:03:14 -05:00
Sean Leary
7844eb79cd
Merge pull request #583 from ek08/fix 
Checked the length of key for checker framework
 2021-02-01 19:48:06 -06:00
Ehtesham
5b531faa49 Improved the logic for checking the length of key 2021-01-28 15:31:23 +05:30
Ehtesham
31ff8a2291 Checked the length of key for checker framework 2021-01-27 11:35:38 +05:30
Sean Leary
e33f463179
Merge pull request #581 from valfirst/patch-1 
Use built-in Gradle shorthand notation for Maven Central repository
 2021-01-10 18:35:31 -06:00
Valery Yatsynovich
e77a77e841
Use built-in Gradle shorthand notation for Maven Central repository 2020-12-29 14:16:46 +03:00
Sean Leary
26f48484fd
Merge pull request #577 from stranck/master 
Added clear() methods to JSONObject and JSONArray
 2020-12-07 16:54:18 -06:00
Stranck
efad1d73a7 Added UnitTests 
(I hope they works :c)
 2020-12-04 04:09:19 +01:00
Stranck
c7130d577a Oops 2020-12-04 01:09:18 +01:00
Stranck
d85eea53bb Update JSONArray.java 2020-12-04 01:07:29 +01:00
Stranck
57ad94ef5e Added clear() methods to JSONObject and JSONArray 2020-12-04 00:49:21 +01:00
Sean Leary
a57eff26d5
Merge pull request #575 from johnjaylward/fix-similar-compare-numbers 
Fix similar compare numbers
 2020-11-22 15:23:03 -06:00
John J. Aylward
68883b9ff8 update number handling to use new helper method for consistency. 2020-11-19 19:10:08 -05:00
John J. Aylward
11e6b1af7e fixes issue #573 by added specific compare of numeric types 2020-11-19 18:55:49 -05:00
John J. Aylward
e4b76d6588 Add test to demonstrate the issue. See #573 2020-11-19 18:18:27 -05:00
John J. Aylward
3a8193bea4 upgrade junit version 2020-11-19 18:18:02 -05:00
Sean Leary
6bf2692a94
Update README.md 2020-11-15 16:09:50 -06:00
Sean Leary
fdde43cd3b
Update README.md 20201115 2020-11-15 12:48:51 -06:00
Sean Leary
6b779f8ca7
Merge pull request #570 from stleary/update-readme 
Readme - fix spelling and usage, per Grammarly
 2020-10-23 23:05:38 -05:00
stleary
59b7a7adff fix spelling and usage, per Grammarly 2020-10-16 08:58:04 -05:00
Sean Leary
7abd89b4bc
Merge pull request #540 from kumar529/master 
Added type conversion support
 2020-09-17 07:37:31 -05:00
Rahul Kumar
56d4130a86 Added shallow copy for config map 2020-09-06 11:17:10 +05:30
Rahul Kumar
ed9658d5cb Corrected Javadoc 2020-09-04 16:51:55 +05:30
Rahul Kumar
310f18fcdc Addressed comment 2020-09-03 11:17:10 +05:30
Rahul Kumar
900a8cc945 Removed changes from depricated method 2020-08-06 07:29:32 +05:30
Rahul Kumar
0a8091c954 Added documentation 2020-08-05 22:25:45 +05:30
Rahul Kumar
61c1a882d6 Added configuration support for type conversion using Map 2020-08-03 08:54:59 +05:30
Rahul Kumar
250f74ef4d Added type conversion support 2020-08-03 08:18:20 +05:30
Sean Leary
5541a6d91d
Merge pull request #552 from johnjaylward/JSONArrayCopyConstructor 
Updates for JSONArray.putAll methods
 2020-08-01 09:19:29 -05:00
John J. Aylward
d30ecad7f8 Update README for best practices when using putAll on JSONArray 2020-07-30 10:13:01 -04:00
John J. Aylward
f35194bc1d Updates the addAll methods to have optional wrapping. 
When called from the constructor, the individual items in the
collection/array are wrapped as done originally before the `putAll`
methods were added.

However this commit changes how `putAll` works. The items are no longer
wrapped in order to keep consistency with the other `put` methods.

However this can lead to inconsistencies with expectations. For example
code like this will create a mixed JSONArray, some items wrapped, others
not:

```java
SomeBean[] myArr = new SomeBean[]{ new SomeBean(1), new SomeBean(2) };
JSONArray jArr = new JSONArray(myArr); // these will be wrapped
// these will not be wrapped
jArr.putAll(new SomeBean[]{ new SomeBean(3), new SomeBean(4) });
```

For consistency, it would be recommended that the above code is changed
to look like 1 of 2 ways.

Option 1:
```Java
SomeBean[] myArr = new SomeBean[]{ new SomeBean(1), new SomeBean(2) };
JSONArray jArr = new JSONArray();
jArr.putAll(myArr); // will not be wrapped
// these will not be wrapped
jArr.putAll(new SomeBean[]{ new SomeBean(3), new SomeBean(4) });
// our jArr is now consistent.
```

Option 2:
```Java
SomeBean[] myArr = new SomeBean[]{ new SomeBean(1), new SomeBean(2) };
JSONArray jArr = new JSONArray(myArr); // these will be wrapped
// these will be wrapped
jArr.putAll(new JSONArray(new SomeBean[]{ new SomeBean(3), new
SomeBean(4) }));
// our jArr is now consistent.
```
 2020-07-30 10:10:06 -04:00
John J. Aylward
5d828d2c0b update comments and increase speed of merging JSONArray objects 2020-07-30 10:10:06 -04:00
John J. Aylward
c175a9eb62 remove clone 2020-07-30 10:10:06 -04:00
John J. Aylward
3c9573cc3d update some javadoc 2020-07-30 10:10:06 -04:00
John J. Aylward
f37c2d67c5 Update for JSONArray.putAll methods 
* Adds a copy constructor for JSONArray
* Updates the JSONArray.addAll(Object) method to be more lenient
* Adds support for JSONArray.putAll of generic Iterables
* Adds support for JSONArray.putAll of another JSONArray
 2020-07-30 10:10:06 -04:00
Sean Leary
6351fa63aa
Merge pull request #549 from stleary/rewrite-readme 
Update readme.md
 2020-07-28 23:48:01 -05:00
Sean Leary
870fa03a19
Merge pull request #529 from ethauvin/master 
Added putAll(Collection) and putAll(Array) methods.
 2020-07-25 12:45:44 -05:00