Commit Graph

  • 284a316838 Add optJSONArray and optJSONObject methods to JSONArray with a default value Edijs 2023-09-27 19:30:45 +03:00
  • 4e8231c512 Merge pull request #770 from eamonnmcmanus/testfixes Sean Leary 2023-09-25 20:37:44 -05:00
  • db0fde2a56 Add optJSONArray method to JSONObject with a default value Edijs 2023-09-25 20:18:33 +03:00
  • 661114c50d Generalize the logic to disallow nested objects and arrays as keys in objects. Éamonn McManus 2023-09-20 10:50:48 -07:00
  • ca88454f1c fix: flakiness in org.json.junit.JSONObjectTest#valueToString simonh5 2023-09-19 14:28:06 -05:00
  • 3e688afc66 Small test fixes. Éamonn McManus 2023-09-19 07:38:13 -07:00
  • becc1631e6 fix: flakiness in JSONMLTest#testToJSONObject_reversibility simonh5 2023-09-18 20:20:13 -05:00
  • 01727fd0ed Merge pull request #769 from jscrdev/fixed-warnings Sean Leary 2023-09-16 08:30:44 -05:00
  • 74cd73f97c Addressed compile warnings Valentyn Kolesnikov 2023-09-08 07:34:00 +03:00
  • c29d4881e0 Merge pull request #741 from jscrdev/setup-java-11 Sean Leary 2023-09-03 17:17:04 -05:00
  • 7c1b6531e7 Update CONTRIBUTING.md Sean Leary 2023-09-03 11:35:15 -05:00
  • db122e5d3a Merge branch 'master' into setup-java-11 Valentyn Kolesnikov 2023-09-03 18:40:40 +03:00
  • a309931d20 Merge pull request #761 from bowbahdoe/master Sean Leary 2023-09-03 10:35:21 -05:00
  • e27da22e05 Update build.gradle Valentyn Kolesnikov 2023-08-29 05:00:13 +03:00
  • af6d07cecb Resolved Gradle build dependency Valentyn Kolesnikov 2023-08-29 03:22:20 +03:00
  • 64093366b3 Merge pull request #764 from johnjaylward/CodeQl_Pipeline_Update Sean Leary 2023-08-28 19:20:36 -05:00
  • 9b69ec49ad update CodeQL action version John J. Aylward 2023-08-28 12:43:17 -04:00
  • 2c674be1b6 Update pipeline.yml Valentyn Kolesnikov 2023-08-28 18:13:22 +03:00
  • be33deb7d5 Update README.md Valentyn Kolesnikov 2023-08-28 02:36:02 +03:00
  • 48089a4da7 Update pipeline.yml Valentyn Kolesnikov 2023-08-28 02:21:18 +03:00
  • a4e152f4f0 Update pipeline.yml Valentyn Kolesnikov 2023-08-27 15:42:27 +03:00
  • 3dd8f2ecd5 Correction of bug when compiling/testing on Windows: Issue537 file must be read as UTF-8 (Issue 745) dburbrid 2023-06-26 09:33:03 +01:00
  • bae0b0dac9 Updated mockito Valentyn Kolesnikov 2023-05-29 11:01:16 +03:00
  • e563dbcaaa Setup java 8 as minimum version Valentyn Kolesnikov 2023-05-29 10:34:40 +03:00
  • 50dfcc59b3 Remove automatic module name Ethan McCue 2023-08-16 11:25:15 -04:00
  • b2943eb395 Add module-info to maven build Ethan McCue 2023-08-16 11:24:57 -04:00
  • 60662e2f83 Merge pull request #759 from eamonnmcmanus/eofnull Sean Leary 2023-08-05 08:33:26 -05:00
  • 2a4bc3420a Apply simplification suggested by @johnjaylward. Éamonn McManus 2023-08-01 14:38:45 -07:00
  • b6ff0db984 Fix indentation in test. Éamonn McManus 2023-08-01 13:49:59 -07:00
  • c8a9e15a57 Don't skip past \0 when parsing JSON objects. Éamonn McManus 2023-08-01 13:11:25 -07:00
  • 402db6ad84 Merge pull request #753 from davejbur/add-object-methods-and-test Sean Leary 2023-07-14 20:03:13 -05:00
  • 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. dburbrid 2023-06-29 09:39:34 +01:00
  • 8ce0019a5d Merge pull request #752 from davejbur/issue-745-compile-error Sean Leary 2023-06-28 20:45:05 -05:00
  • 3d524349a1 Correction of bug when compiling/testing on Windows: Issue537 file must be read as UTF-8 (Issue 745) dburbrid 2023-06-26 09:33:03 +01:00
  • a963115ac2 Update pom.xml for maven deploy Sean Leary 2023-06-18 12:58:32 -05:00
  • f959baa3cb Merge pull request #749 from stleary/pre-release-20230618 Sean Leary 2023-06-18 12:24:27 -05:00
  • c048b36516 Update pom.xml for 20230618 Sean Leary 2023-06-18 12:18:36 -05:00
  • f6e5bfa2db Update RELEASES.md for 20230618 Sean Leary 2023-06-18 12:17:56 -05:00
  • 084b24cbe7 Update README.md for 20230618 Sean Leary 2023-06-18 12:16:14 -05:00
  • 22ccf1b8e5 Merge pull request #740 from michael-o/proper-encoding Sean Leary 2023-05-28 14:11:41 -05:00
  • 133c0cc75f JSONTokener(InputStream) violates rfc8259#section-8.1 (#739) Michael Osipov 2023-05-24 11:45:25 +02:00
  • 0578285036 Merge pull request #734 from superMaaax/fix_flaky Sean Leary 2023-03-27 16:25:57 -05:00
  • 48fb5261fe Fixed Flaky Tests Caused by JSON permutations superMaaax 2023-03-21 20:58:32 -05:00
  • 8353b9c3f0 Merge pull request #731 from JoaoGFarias/patch-1 Sean Leary 2023-03-11 19:28:01 -06:00
  • fe22b242b5 Merge pull request #733 from haribabu-dev/jsontokener_closable Sean Leary 2023-03-11 19:26:55 -06:00
  • 7eca507d13 Removed overriding closable interface. HariBabu t 2023-03-07 13:58:30 +08:00
  • e1eabc9c27 JSONTokener implemented java.io.Closeable HariBabu t 2023-03-04 23:08:32 +08:00
  • 0d436d92e2 Removing commented out code João Farias 2023-03-02 16:39:11 +01:00
  • 45bcba518f Merge pull request #729 from TamasPergerDWP/f-parserconfig Sean Leary 2023-02-28 12:49:42 -06:00
  • 47fb49b6a8 Update for release 20230227 Sean Leary 2023-02-27 07:21:11 -06:00
  • 0df034c9fd Update for release 20230227 Sean Leary 2023-02-27 07:20:10 -06:00
  • f0a05e6911 Update README.md Sean Leary 2023-02-27 07:17:51 -06:00
  • 24093491a8 refactor: introduce ParserConfiguration class hierarchy Tamas Perger 2023-02-21 19:13:07 +00:00
  • 1275f6809d Merge pull request #723 from TamasPergerDWP/master Sean Leary 2023-02-17 13:47:36 -06:00
  • 9234eab00a refactor: make JSONMLParserConfiguration all-args constructor private, enforcing the builder pattern. Tamas Perger 2023-02-13 01:09:29 +00:00
  • 72f4c3e646 refactor: rename XMLtoJSONMLParserConfiguration to JSONMLParserConfiguration Tamas Perger 2023-02-12 01:32:34 +00:00
  • df2d6f8363 fix: introduce optional XMLtoJSONMLParserConfiguration parameter for JSONML.toJSONArray(...) functions, to facilitate max nesting depth override. Tamas Perger 2023-02-11 01:52:13 +00:00
  • a6e412bded fix: limit the nesting depth in JSONML Tamas Perger 2023-02-10 01:46:44 +00:00
  • 2391d248cc fix: amend XMLParserConfiguration.clone() to include the new maxNestingDepth param. Tamas Perger 2023-02-10 01:45:34 +00:00
  • 401495ae86 Merge pull request #720 from cleydyr/issue-708 Sean Leary 2023-02-05 19:30:04 -06:00
  • 448e204186 docs: remove wrong description of parse method Cleydyr de Albuquerque 2023-02-02 20:16:16 +01:00
  • eb56704e68 fix: set default maximum nesting depth as 512 Cleydyr de Albuquerque 2023-02-02 18:15:03 +01:00
  • 651511f500 tests: add new test to verify that an XML having the permitted nesting depth can be converted Cleydyr de Albuquerque 2023-02-01 20:21:14 +01:00
  • a14cb12c85 refactor: keep consistence with other tests and tidy up constant Cleydyr de Albuquerque 2023-02-01 20:20:18 +01:00
  • f566a1d9ee fix: limit the nesting depth Cleydyr de Albuquerque 2023-01-31 17:32:34 +01:00
  • 5920eca2d7 Merge pull request #711 from 6d64/revert-pull-707-interviewbit-spam Sean Leary 2022-11-30 20:20:39 -06:00
  • 3b097d051a Revert pull 707 - interviewbit spam 6d64 2022-12-01 03:21:26 +11:00
  • 4e630e58a4 Merge pull request #707 from ASAlishaa/patch-1 Sean Leary 2022-11-17 19:14:11 -06:00
  • b732188e4e Added new resource to this repos. ASAlisha 2022-11-15 16:31:05 +05:30
  • 5369442671 Added new resource to the repos ASAlisha 2022-11-14 03:26:18 +05:30
  • bb1138762a Merge pull request #703 from TomerPacific/feature/update-release-for-JSONMap-Change Sean Leary 2022-11-05 17:39:13 -05:00
  • 6a732ec99d Merge pull request #704 from niranjanib/fix-javadoc-not-visible-in-website Sean Leary 2022-11-05 17:38:15 -05:00
  • c798c76ddd move javadoc comments above the interface definition to make it visible Niranjani 2022-10-30 22:10:38 +05:30
  • 23d5e52a53 feature/update-release-for-JSONMap-Change adding breaking change for JSONMap to corresponding release unknown 2022-10-28 08:45:54 +03:00
  • 98df35449a Merge pull request #696 from bmk15897/fix-flaky-test Sean Leary 2022-10-15 08:24:01 -05:00
  • 1be6ee31a7 Merge pull request #694 from DeaneOC/Pretty-Print-XML-Functionality Sean Leary 2022-10-13 21:46:26 -05:00
  • a2d3d3c9b5 Fix Flaky Test Bharati Kulkarni 2022-10-11 14:33:43 -05:00
  • bf9219386a Merge branch 'master' of https://github.com/stleary/JSON-java into Pretty-Print-XML-Functionality Dean 2022-10-10 11:12:49 +01:00
  • 85495facbd Corrected test Dean 2022-10-10 11:12:35 +01:00
  • 7aba3ac941 System line seperator now being used in JUnit test Dean 2022-10-10 11:09:42 +01:00
  • d51250f6b0 Merge pull request #692 from InACommandBlock/patch-1 Sean Leary 2022-10-09 22:28:36 -05:00
  • 9cb8e153bf Added JavaDocs Dean 2022-10-07 17:57:07 +01:00
  • 80c1479ad8 Merge branch 'master' of https://github.com/stleary/JSON-java into Pretty-Print-XML-Functionality Dean 2022-10-07 17:56:54 +01:00
  • 444335d12a Merge pull request #691 from hendrixjoseph/issue-657-unit-tests-should-check-various-number-formats Sean Leary 2022-10-07 11:18:41 -05:00
  • a2c0562e04 Removed unused import Dean 2022-10-07 15:04:09 +01:00
  • 153972afdf Adding resources Dean 2022-10-07 10:35:14 +01:00
  • 4a8ff28fd8 Reduced Test code length by using resources Dean 2022-10-07 10:35:06 +01:00
  • fa457a4113 Test cases for XML toString indentation Dean 2022-10-06 12:01:26 +01:00
  • b7f708b222 Altered XML toString to allow indentation param Dean 2022-10-06 12:01:13 +01:00
  • 12411b7981 Update Examples.md TheCommandBlock 2022-10-06 03:18:03 +02:00
  • 61801c623e Minor Adjustments Example.md TheCommandBlock 2022-10-06 00:48:34 +02:00
  • 1915aab7c4 create unit tests for various number formats hendrixjoseph 2022-10-04 14:32:41 -04:00
  • 8439039da7 Update pom.xml Sean Leary 2022-09-24 16:25:18 -05:00
  • a6bdd081eb Update RELEASES.md Sean Leary 2022-09-24 16:13:11 -05:00
  • a30d71fdca Update README.md Sean Leary 2022-09-24 16:11:12 -05:00
  • cdd67b0aef Merge pull request #688 from stleary/update-copyright Sean Leary 2022-08-26 21:07:52 -05:00
  • 89f6e7f6a6 Merge branch 'master' into update-copyright stleary 2022-08-26 20:59:00 -05:00
  • 346fb26f2d Merge pull request #683 from spaffrath/Issue_682_JSONString_similarity Sean Leary 2022-08-26 20:57:22 -05:00
  • 6daabb43ab update-copyright - Replace copyright and license restrictions with Public Domain stleary 2022-08-23 20:00:25 -05:00
  • 57f785c42e Merge pull request #687 from schw1804/patch-1 Sean Leary 2022-08-23 17:13:10 -05:00