157 Commits

Author SHA1 Message Date
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
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
870fa03a19
Merge pull request #529 from ethauvin/master
Added putAll(Collection) and putAll(Array) methods.
2020-07-25 12:45:44 -05:00
stleary
98cd8ef8b2 fix CI build error 2020-07-24 03:24:41 -05:00
Sean Leary
78528102d0
Merge pull request #543 from johnjaylward/RefactorXmlConfiguration
Refactor XMLConfiguration to use Builder Pattern
2020-07-24 02:49:28 -05:00
Sean Leary
0e34d8d383
Merge pull request #539 from stleary/unit-tests-1.6
Bring Junit tests to Java 1.6 compatibility
2020-07-24 02:48:38 -05:00
Erik C. Thauvin
0d13e56064 Added tests for consecutive calls to putAll. 2020-07-21 23:09:28 -07:00
Erik C. Thauvin
f1d354ce7b Increase array list capacity in addAll(collection) method to ensure it can hold additional elements. 2020-07-21 17:35:32 -07:00
Erik C. Thauvin
86e136afc9 Increase array list capacity in addAll method to ensure it can hold additional elements. 2020-07-21 17:11:24 -07:00
John J. Aylward
4f1c8b2d6f formatting 2020-07-21 11:30:35 -04:00
John J. Aylward
5a31f9ef5f Refs #541
Updates XML configuration to use a builder pattern instead of
constructors with many parameters
2020-07-21 11:08:40 -04:00
John J. Aylward
c136668f23 remove new lines from test file text blocks to prevent issues with the
parsing compare on different operating systems
2020-07-20 18:58:00 -04:00
John J. Aylward
e18f42becc fixes #537 corrects case-sensitive entity unescape 2020-07-20 18:38:35 -04:00
John J. Aylward
e0a6c2ef34 refs #537 Show error when unescaping all-caps entity directly 2020-07-20 18:36:52 -04:00
John J. Aylward
c98da43184 Refs #537 Add test cases to verify no issue 2020-07-20 18:25:51 -04:00
John J. Aylward
734f182242 Update error messages to use the built in assertEquals 2020-07-20 18:25:22 -04:00
stleary
c63e78bbc7 initial commit 2020-07-18 17:14:39 -05:00
John J. Aylward
f9908a6adb adds comment on test case to document why it was added. 2020-06-25 11:51:46 -04:00
John J. Aylward
ba6c4089ea fixes #531
Add test result to confirm that #531 is working in latest version.
2020-06-25 11:42:07 -04:00
Erik C. Thauvin
aa0a5a7245 Added putAll(Collection) and putAll(Array) methods. 2020-06-16 14:55:16 -07:00
Sean Leary
9de97438ac
Merge pull request #524 from viveksacademia4git/i516-JSONArray-ConstructParam-InitCapacity
Development for stleary#516 completed with rebased repository
2020-06-12 10:48:21 -05:00
John J. Aylward
c11c006e88 fix tests to not depend on HashSet key order 2020-06-05 19:09:10 -04:00
stleary
cf00d2f265 initial commit 2020-06-03 21:12:19 -05:00
John J. Aylward
b6ed0d4178 fix failing test case in Java1.7 2020-06-03 19:37:08 -04:00
vivek
d088cf014e Development for stleary#516 completed with rebased repository
- Introduced JSONObject(int) constructor.
   - int > Initial capacity of the underlying data structure

- Test for new introduced JSONArray(int) constructor.
   1. Checked with input parameter: 0
   2. Checked with input parameter: positive number
   3. Checked with positive number input parameter and compared length
   4. If input parameter is negative number JSONException is thrown:
         JSONArray initial capacity cannot be negative.
2020-06-03 11:46:48 +02:00
Sean Leary
19bb6fd606
Merge pull request #453 from johnjaylward/UseBigDecimalDefaultParse
changes number parsing to use BigDecimal as the backing type
2020-06-01 14:03:04 -05:00
John J. Aylward
56d33b8061 changes number parsing to use BigDecimal as the backing type
* updated tests to support BigDecimal as the backing type for numbers
* updated some test resource handling to java7 try-with-resources format
* cleaned up some other minor compiler warnings
2020-05-26 10:10:36 -04:00
John J. Aylward
6029dece41 ensure key names are consistent when parsing the cookie string since
cookie-keys are not case sensitive, but json-keys are.
2020-05-26 09:11:10 -04:00
John J. Aylward
d334b58f45 Made more corrections to Cookie.ToString.
1. Made Cookie Name and Value properties case insensitive
2. Throws exception on illegal Cookie Name
3. Doesn't emit "false" flag values
4. Properly escape key-value attributes.
2020-05-26 08:55:19 -04:00
John J. Aylward
b4a75c7bf8 Updates Cookie class to be a more generic in attribute parsing and emit.
This is so the library can age better as new attributes are added to RFC
revisions.
2020-05-26 08:53:37 -04:00
stleary
2b0a8838ef gradle support 2020-05-22 11:17:44 -05:00
Benjamin Gehrels
1265897f4e Merge remote-tracking branch 'tests/master' into upstream 2020-04-29 20:26:05 +02:00
Benjamin Gehrels
74e4932cfc Transform the repository into standard maven format and merge the pom.xml of the release repo 2020-04-29 19:24:44 +02:00
Alan Wang
08719d4b3a
Apply suggestions from code review
Co-Authored-By: Sean Leary <stleary@gmail.com>
2019-12-30 09:51:08 +08:00
Alanscut
16da56eb34 improve the confused assert message 2019-12-28 17:53:27 +08:00
Sean Leary
18eddf75c3
Merge pull request #95 from johnjaylward/StandardizeExceptionMessages
Test cases updates for standardized exception messages
2019-09-24 20:30:08 -05:00
John J. Aylward
a24db2cce2 remove unused import 2019-09-17 11:15:25 -04:00
John J. Aylward
67e59888a2 add second case for data in #484 2019-09-17 11:14:41 -04:00
John J. Aylward
fb01575394 Test cases updates for standardized exception messages 2019-09-17 10:47:16 -04:00
John J. Aylward
3e7a0b13d1 new test case for issue 484 2019-09-17 10:36:48 -04:00