Commit Graph

  • fb71d9d40f
    Merge pull request #606 from artem-smotrakov/fix-javadoc Sean Leary 2021-08-17 20:40:04 -05:00
  • b80141a19c
    Merge pull request #607 from artem-smotrakov/add-security-policy Sean Leary 2021-08-14 15:02:05 -05:00
  • c0e467c848
    Merge pull request #613 from stleary/fix-similar-check Sean Leary 2021-07-26 18:12:44 -05:00
  • 8680b10716 merge from master to pick up #616 and add one more test stleary 2021-07-26 18:07:38 -05:00
  • 2559114dbb Merge branch 'master' into fix-similar-check stleary 2021-07-26 17:53:20 -05:00
  • bb048e3ffb
    Merge pull request #617 from johnjaylward/issue-616-similar-bug Sean Leary 2021-07-26 17:47:03 -05:00
  • 579784d73e correct error in converting doubles to big decimals John Aylward 2021-07-22 23:13:19 -04:00
  • c03054b1a6 Add test to show bug John Aylward 2021-07-22 22:57:15 -04:00
  • 4e0faebe62 fix javadoc errors that prevent compilation in Eclipse John Aylward 2021-07-22 22:54:46 -04:00
  • c6089e53f5 Fixes Issue #611 JsonArray.similar() returns after number entry check stleary 2021-07-18 19:53:23 -05:00
  • cfbc306673 Fixes Issue #611 JsonObject.similar() returns after number entry check stleary 2021-07-18 10:32:49 -05:00
  • 449ec8745e
    Merge pull request #610 from tilds/optJSONObject-defaultValue Sean Leary 2021-06-28 22:01:37 -05:00
  • f91d0c8a52 New JSONObject.optJSONObject method with defaultValue parameter Niels Frederiksen 2021-06-23 15:15:00 +02:00
  • 4571978840 Merge branch 'master' of https://github.com/stleary/JSON-java stleary 2021-06-22 19:46:44 -05:00
  • 76ec2fe5a2 Revert accidentally changed file stleary 2021-06-22 19:46:33 -05:00
  • 0200c984cc
    Update README.md Sean Leary 2021-06-22 19:41:31 -05:00
  • 8f3e5ade18 Add logo image stleary 2021-06-22 19:34:22 -05:00
  • 20b4f85efe
    Updated build command in the CodeQL workflow Artem Smotrakov 2021-05-31 15:30:20 +02:00
  • 5bc8dae5d0
    Setup CodeQL scans Artem Smotrakov 2021-05-31 15:24:41 +02:00
  • 8fa9be742c
    Added a security policy Artem Smotrakov 2021-05-31 15:16:27 +02:00
  • b48abe6558
    Suppress java/unchecked-cast-in-equals warning for JSONObject.Null.equals() Artem Smotrakov 2021-05-31 15:00:29 +02:00
  • 97023e1098
    Fix Javadoc formatting in JSONObject and XMLParserConfiguration Artem Smotrakov 2021-05-31 14:53:59 +02:00
  • 143db39d27
    Merge pull request #604 from ianlovejoy/master Sean Leary 2021-05-01 08:50:54 -05:00
  • 75894086e5 Fixed incorrect cast getting float from array Added test for getting float from array Ian Lovejoy 2021-04-27 19:03:35 -07:00
  • fa46da45f4
    Merge pull request #601 from AISS-2021-L5-G02/master Sean Leary 2021-04-21 00:31:12 -05:00
  • f912e5d1c4
    Merge pull request #2 from TheNeoStormZ/master TheNeoStormZ 2021-04-02 19:31:42 +02:00
  • 6bf3d38889 Changed JSONExamples to a Markdown file (and another place) with minor tweaks Pablo Marín Gómez 2021-04-02 19:28:37 +02:00
  • c62df81b3e
    Merge pull request #1 from TheNeoStormZ/master TheNeoStormZ 2021-04-02 11:28:25 +02:00
  • e1f69ff3fe Added some examples for new-comers Pablo Marín Gómez 2021-04-02 11:25:57 +02:00
  • 50d619698f
    Merge pull request #594 from anton0xf/patch-1 Sean Leary 2021-03-18 19:42:49 -05:00
  • 29103e3228
    JSONStringer.java: fix max nesting level in javadoc anton0xf 2021-03-14 22:45:38 +05:00
  • 2630676f36
    Update README.md Sean Leary 2021-03-09 19:54:54 -06:00
  • 7299b201f4
    Update pom.xml 20210307 Sean Leary 2021-03-07 21:11:48 -06:00
  • 8cc1e9830d
    Update README.md Sean Leary 2021-03-07 21:09:01 -06:00
  • c43e21ae73
    Merge pull request #588 from fossterer/563-jsonpointer-do-not-encode-quotes Sean Leary 2021-03-06 10:00:32 -06:00
  • d6ccc64c79 Closes 563: As never defined in RFC 6901 Section 3, do not handle backslashes (\) and quotes(") as anything special Shashank Sabniveesu 2021-02-28 16:01:59 -05:00
  • 7844eb79cd
    Merge pull request #583 from ek08/fix Sean Leary 2021-02-01 19:48:06 -06:00
  • 5b531faa49 Improved the logic for checking the length of key Ehtesham 2021-01-28 15:31:23 +05:30
  • 31ff8a2291 Checked the length of key for checker framework Ehtesham 2021-01-27 11:35:38 +05:30
  • e33f463179
    Merge pull request #581 from valfirst/patch-1 Sean Leary 2021-01-10 18:35:31 -06:00
  • e77a77e841
    Use built-in Gradle shorthand notation for Maven Central repository Valery Yatsynovich 2020-12-29 14:16:46 +03:00
  • 02654f7fe7 update docs stleary 2020-12-27 15:04:38 -06:00
  • 765afe6ee6 update docs stleary 2020-12-27 15:04:18 -06:00
  • 7afd93263f Merge branch 'master' into gh-pages stleary 2020-12-27 14:53:10 -06:00
  • 26f48484fd
    Merge pull request #577 from stranck/master Sean Leary 2020-12-07 16:54:18 -06:00
  • efad1d73a7 Added UnitTests Stranck 2020-12-04 04:09:19 +01:00
  • c7130d577a Oops Stranck 2020-12-04 01:09:18 +01:00
  • d85eea53bb Update JSONArray.java Stranck 2020-12-04 01:07:29 +01:00
  • 57ad94ef5e Added clear() methods to JSONObject and JSONArray Stranck 2020-12-04 00:49:21 +01:00
  • a57eff26d5
    Merge pull request #575 from johnjaylward/fix-similar-compare-numbers Sean Leary 2020-11-22 15:23:03 -06:00
  • 68883b9ff8 update number handling to use new helper method for consistency. John J. Aylward 2020-11-19 19:10:08 -05:00
  • 11e6b1af7e fixes issue #573 by added specific compare of numeric types John J. Aylward 2020-11-19 18:24:56 -05:00
  • e4b76d6588 Add test to demonstrate the issue. See #573 John J. Aylward 2020-11-19 18:18:27 -05:00
  • 3a8193bea4 upgrade junit version John J. Aylward 2020-11-19 18:18:02 -05:00
  • 6bf2692a94
    Update README.md Sean Leary 2020-11-15 16:09:50 -06:00
  • fdde43cd3b
    Update README.md 20201115 Sean Leary 2020-11-15 12:48:51 -06:00
  • 6b779f8ca7
    Merge pull request #570 from stleary/update-readme Sean Leary 2020-10-23 23:05:38 -05:00
  • 59b7a7adff fix spelling and usage, per Grammarly stleary 2020-10-16 08:58:04 -05:00
  • f807731ca2 latest stleary 2020-10-06 15:23:44 -05:00
  • 19d0ef916d change dir from docs stleary 2020-10-06 15:19:54 -05:00
  • 4f7ad29163 update to latest stleary 2020-10-06 15:13:19 -05:00
  • 4082085543 Merge branch 'master' into gh-pages stleary 2020-10-06 15:04:44 -05:00
  • 7abd89b4bc
    Merge pull request #540 from kumar529/master Sean Leary 2020-09-17 07:37:31 -05:00
  • 56d4130a86 Added shallow copy for config map Rahul Kumar 2020-09-06 11:17:10 +05:30
  • ed9658d5cb Corrected Javadoc Rahul Kumar 2020-09-04 16:51:55 +05:30
  • 310f18fcdc Addressed comment Rahul Kumar 2020-09-03 11:17:10 +05:30
  • 900a8cc945 Removed changes from depricated method Rahul Kumar 2020-08-06 07:29:32 +05:30
  • 0a8091c954 Added documentation Rahul Kumar 2020-08-05 22:25:45 +05:30
  • 61c1a882d6 Added configuration support for type conversion using Map Rahul Kumar 2020-08-03 08:54:59 +05:30
  • 250f74ef4d Added type conversion support Rahul Kumar 2020-07-19 18:51:14 +05:30
  • 5541a6d91d
    Merge pull request #552 from johnjaylward/JSONArrayCopyConstructor Sean Leary 2020-08-01 09:19:29 -05:00
  • d30ecad7f8 Update README for best practices when using putAll on JSONArray John J. Aylward 2020-07-30 10:13:01 -04:00
  • f35194bc1d Updates the addAll methods to have optional wrapping. John J. Aylward 2020-07-30 09:51:24 -04:00
  • 5d828d2c0b update comments and increase speed of merging JSONArray objects John J. Aylward 2020-07-29 16:13:54 -04:00
  • c175a9eb62 remove clone John J. Aylward 2020-07-29 15:30:02 -04:00
  • 3c9573cc3d update some javadoc John J. Aylward 2020-07-27 11:54:20 -04:00
  • f37c2d67c5 Update for JSONArray.putAll methods John J. Aylward 2020-07-27 11:39:55 -04:00
  • 6351fa63aa
    Merge pull request #549 from stleary/rewrite-readme Sean Leary 2020-07-28 23:48:01 -05:00
  • 870fa03a19
    Merge pull request #529 from ethauvin/master Sean Leary 2020-07-25 12:45:44 -05:00
  • 555f712a8c
    Update README.md Sean Leary 2020-07-25 12:41:03 -05:00
  • db2d1714de
    Update README.md Sean Leary 2020-07-25 12:40:41 -05:00
  • 650f52501a
    Update README.md Sean Leary 2020-07-25 12:36:53 -05:00
  • 896674ae36
    Update README.md Sean Leary 2020-07-25 12:35:58 -05:00
  • 8f0c3b0bf8
    Update README.md Sean Leary 2020-07-25 12:35:12 -05:00
  • 0de8d0d2e0
    Update README.md Sean Leary 2020-07-25 12:34:01 -05:00
  • 46fe58e912
    Update README.md Sean Leary 2020-07-25 12:31:20 -05:00
  • 26cd17687f
    Update README.md Sean Leary 2020-07-25 12:31:02 -05:00
  • 879fba3f7f rewrite - first commit stleary 2020-07-25 12:27:20 -05:00
  • 98cd8ef8b2 fix CI build error stleary 2020-07-24 03:24:41 -05:00
  • 78528102d0
    Merge pull request #543 from johnjaylward/RefactorXmlConfiguration Sean Leary 2020-07-24 02:49:28 -05:00
  • 0e34d8d383
    Merge pull request #539 from stleary/unit-tests-1.6 Sean Leary 2020-07-24 02:48:38 -05:00
  • 880402120c
    Merge pull request #542 from johnjaylward/fixXmlHexEntityParse Sean Leary 2020-07-23 11:02:14 -05:00
  • d10725dc92
    Merge pull request #538 from stleary/readme-local-build Sean Leary 2020-07-23 11:00:25 -05:00
  • 0d13e56064 Added tests for consecutive calls to putAll. Erik C. Thauvin 2020-07-21 23:09:28 -07:00
  • f1d354ce7b Increase array list capacity in addAll(collection) method to ensure it can hold additional elements. Erik C. Thauvin 2020-07-21 17:35:32 -07:00
  • 86e136afc9 Increase array list capacity in addAll method to ensure it can hold additional elements. Erik C. Thauvin 2020-07-21 17:11:24 -07:00
  • 4f1c8b2d6f formatting John J. Aylward 2020-07-21 11:30:35 -04:00
  • 5a31f9ef5f Refs #541 Updates XML configuration to use a builder pattern instead of constructors with many parameters John J. Aylward 2020-07-21 11:08:40 -04:00
  • c136668f23 remove new lines from test file text blocks to prevent issues with the parsing compare on different operating systems John J. Aylward 2020-07-20 18:58:00 -04:00
  • e18f42becc fixes #537 corrects case-sensitive entity unescape John J. Aylward 2020-07-20 18:38:35 -04:00