1
0
Fork 0
mirror of https://github.com/ethauvin/JSON-java.git synced 2025-06-17 07:50:52 -07:00

Commit graph

  • bbd3fd5571 Adds tests for numbers John J. Aylward 2016-08-16 19:45:26 -04:00
  • 349a209df3 Merge remote-tracking branch 'upstream/master' into EnumCleanup John J. Aylward 2016-08-15 10:25:27 -04:00
  • 7851e9b2e8 revert back changes to Number support John J. Aylward 2016-08-15 10:24:38 -04:00
  • 7232a95c0b Update JSONObject.java Sean Leary 2016-08-15 01:58:54 -05:00
  • f96f505188 Update JSONArray.java Sean Leary 2016-08-15 01:53:08 -05:00
  • 91107e3e82 Adds support to JSONObject wrap and write methods to explicitly handle Enums. John J. Aylward 2016-08-11 12:22:31 -04:00
  • 5779400f26 test updates to make sure Enums are handled consistently. John J. Aylward 2016-08-11 12:21:49 -04:00
  • c400de3cfe Merge pull request #53 from run2000/master Sean Leary 2016-08-10 21:55:33 -05:00
  • 4e8e24d49d Merge pull request #259 from run2000/appendable_v2 Sean Leary 2016-08-10 21:55:10 -05:00
  • f881b61c81 Update XML.java Sean Leary 2016-08-10 15:35:26 -05:00
  • 37582a44ad Update README 20160810 Sean Leary 2016-08-10 09:13:22 -05:00
  • a418d07460 Merge pull request #55 from johnjaylward/verifyOptMissingKeys Sean Leary 2016-08-10 09:04:27 -05:00
  • 154cfda9aa Merge pull request #261 from stleary/revert-249-master Sean Leary 2016-08-10 09:03:57 -05:00
  • 8bae09f81b removes unnecessary comparison to true John J. Aylward 2016-08-09 16:11:46 -04:00
  • 80e36eb63c Fixes error messages John J. Aylward 2016-08-09 15:59:27 -04:00
  • a2c311527b Updates tests to include all opt methods and verify for missing keys. John J. Aylward 2016-08-09 15:54:06 -04:00
  • 45a7decba4 Revert "reduces the use of unnecessary exceptions" revert-249-master Sean Leary 2016-08-09 14:22:06 -05:00
  • 0c157cae75 JSONWriter uses Appendable. Nicholas Cull 2016-08-08 19:40:10 +10:00
  • 8e079599c4 Update README 20160807 Sean Leary 2016-08-07 15:19:44 -05:00
  • 62524b531d Merge pull request #52 from johnjaylward/OptionalTypeConversion Sean Leary 2016-07-31 21:09:34 -05:00
  • 3080b8beeb Merge pull request #253 from johnjaylward/OptionalTypeConversion Sean Leary 2016-07-31 21:09:07 -05:00
  • 2c228ecf1a Merge pull request #249 from Simulant87/master Sean Leary 2016-07-26 23:04:49 -05:00
  • e57881f8fa Fail when exceptions are not thrown as expected run2000 2016-07-25 09:44:43 +10:00
  • efe33a1e37 Fix comment. Nicholas Cull 2016-07-24 19:57:01 +10:00
  • 1246e12827 Factor out Writer from Appendable tests. Nicholas Cull 2016-07-24 19:39:52 +10:00
  • ffcfa66d77 Add JSONString test class. Nicholas Cull 2016-07-24 18:56:08 +10:00
  • 5d8ea6fa4e Update README.md Sean Leary 2016-07-23 10:13:21 -05:00
  • cdfdaba95b Update README.md Sean Leary 2016-07-23 10:12:33 -05:00
  • 2307f6f85e Update README.md Sean Leary 2016-07-23 10:12:04 -05:00
  • 6b4edbd40c Update README.md Sean Leary 2016-07-23 10:02:19 -05:00
  • ae77b5cd83 Tests for deep copy and mutability of toList() and toMap(). Nicholas Cull 2016-07-23 22:51:50 +10:00
  • 72c2b911bf Tests for toString(), write(), toList(), and toMap(). Nicholas Cull 2016-07-23 22:33:19 +10:00
  • c3ba4bdbe5 Nesting depth test works as expected. Nicholas Cull 2016-07-23 19:12:51 +10:00
  • 3890bfae52 reduce the use of unnecessary exceptions Nils Faupel 2016-07-19 19:58:10 +02:00
  • abf2963bbe Revert "reduces the use of unnecessary exceptions" Nils Faupel 2016-07-19 19:00:42 +02:00
  • 215321cd28 updates Test cases to support new JSONML and XML conversion options John J. Aylward 2016-07-18 15:01:36 -04:00
  • 09d37e59b8 Cleans up the JSONML changes and adds similar changes to the XML class John J. Aylward 2016-07-18 14:42:21 -04:00
  • 93704371bb Updates to the Javadoc for exceptions John J. Aylward 2016-07-18 14:12:06 -04:00
  • 42e0944708 Brings in changes from PR #70 to be updated to HEAD Jakob Stemberger 2012-11-14 20:37:36 +01:00
  • 71c1eba1e7 Merge pull request #51 from johnjaylward/VerifyOptConversions Sean Leary 2016-07-08 22:31:48 -05:00
  • c2de224711 Verify opt method conversions for JSONArray and JSONObject John J. Aylward 2016-07-08 16:58:58 -04:00
  • 7627d40d10 reduces the use of unnecessary exceptions Simulant 2016-07-08 22:17:05 +02:00
  • 04181fb6e2 Merge pull request #246 from johnjaylward/LicenseFile Sean Leary 2016-07-02 13:20:54 -05:00
  • 239e0b7070 Merge pull request #242 from johnjaylward/issue240 Sean Leary 2016-07-02 13:20:21 -05:00
  • a8a71898a3 Create LICENSE johnjaylward 2016-06-22 14:49:52 -04:00
  • 86e8f7b313 Update README johnjaylward 2016-06-17 16:39:11 -04:00
  • 01af31718e Merge pull request #50 from johnjaylward/issue240 Sean Leary 2016-06-17 09:36:42 -05:00
  • 1204ea9dcf fixes a typo John J. Aylward 2016-06-17 00:04:27 -04:00
  • c5deff636b updates README for new project layout John J. Aylward 2016-06-16 23:59:34 -04:00
  • 46a1c9acf9 Adds test case to confirm the parsing of control characters John J. Aylward 2016-06-16 13:02:08 -04:00
  • 42791ab12d Updates README to note that the parser does allow some invalid JSON John J. Aylward 2016-06-16 13:01:22 -04:00
  • 80f9e48e64 Moves src folder to simplify build.gradle configuration. If JSON-Java source is merged, it's src fold would now be src/main/java/org.json/ instead of src/main/org.json as well. John J. Aylward 2016-06-16 12:20:54 -04:00
  • 0e0f3f2167 Merge pull request #1 from stleary/master johnjaylward 2016-06-16 11:44:09 -04:00
  • b3abaa5b4c Merge pull request #1 from stleary/master johnjaylward 2016-06-16 11:43:05 -04:00
  • 40f170b508 Merge pull request #49 from madsager/master Sean Leary 2016-06-07 21:29:25 -05:00
  • eb569b58fc Merge pull request #236 from madsager/master Sean Leary 2016-06-07 21:29:02 -05:00
  • c7fdada0fd Add test that an invalid escape sequence results in a JSONException and not a NumberFormatException. Mads Ager 2016-06-02 16:41:43 +02:00
  • 16a86d73df Pass in the throwable that caused the error. Mads Ager 2016-06-02 16:11:15 +02:00
  • dfa651e777 Make nextString throw a JSONException instead of a NumberFormatException for malformed input. Mads Ager 2016-06-02 15:56:48 +02:00
  • 51bcbebaa8 Merge pull request #48 from erosb/master Sean Leary 2016-05-20 21:12:12 -05:00
  • 612dafc750 Update JSONObject.java Sean Leary 2016-05-20 21:10:17 -05:00
  • 808320801a Update JSONArray.java Sean Leary 2016-05-20 21:09:53 -05:00
  • b2bde1f468 Merge pull request #234 from erosb/master Sean Leary 2016-05-20 21:03:06 -05:00
  • a1893ebc02 unittests for stlear/JSON-Java#233 Bence Erős 2016-05-16 14:54:01 +02:00
  • 56be31e7a8 fixing stleary/JSON-Java#233 Bence Erős 2016-05-16 14:53:34 +02:00
  • 8ed0362683 convert remaining JsonPath expressions to JSONPointer stleary 2016-05-14 13:38:46 -05:00
  • 15f48a0500 convert tests to use JSONPointer where practical stleary 2016-05-14 11:59:24 -05:00
  • 9a81b40334 added some JavaDocs stleary 2016-05-14 11:09:51 -05:00
  • 45cbc66f5b add coverage for JSONObject, JSONArray queryFrom() stleary 2016-05-14 09:26:03 -05:00
  • 4a458a9f1c add timestamps to recent commits, javadocs for JSONObject, JSONArray queryFrom() methods stleary 2016-05-14 09:22:18 -05:00
  • 06ae87c456 exclude resources from test stleary 2016-05-13 23:22:54 -05:00
  • 7038ea884e Merge pull request #47 from stleary/add-to-test-suite-and-fix-resource Sean Leary 2016-05-13 23:17:10 -05:00
  • 0112d82755 add JSONPointerTest to test suite, fix resource for gradle build stleary 2016-05-13 23:13:06 -05:00
  • 46044bfc51 Merge pull request #46 from erosb/master Sean Leary 2016-05-13 22:47:14 -05:00
  • 8a72509e6e Merge pull request #222 from erosb/master Sean Leary 2016-05-13 22:46:52 -05:00
  • a9ff159c78 Update README.md Sean Leary 2016-05-13 15:17:22 -05:00
  • b843d67a92 Update README.md Sean Leary 2016-05-07 07:03:50 -05:00
  • 691734f342 Update README.md Sean Leary 2016-05-07 07:03:30 -05:00
  • ccc7a7af29 Update README.md Sean Leary 2016-05-07 07:02:50 -05:00
  • adb3118d31 added test for checking if the JSONPointer is immutable Bence Erős 2016-05-05 16:00:15 +02:00
  • c044eb14dd added copying to JSONPointer constructor Bence Erős 2016-05-05 15:59:43 +02:00
  • 2eed4be5fc one more test for null-check in Builder#append(String) Bence Erős 2016-05-03 23:42:26 +02:00
  • 5ae6a66e38 added javadoc & null check in Builder#append(String) Bence Erős 2016-05-03 23:41:51 +02:00
  • 6edc093803 adding unittests for JSPONPointer#toString(), toURIFragment() and its builder class Bence Erős 2016-05-03 23:20:17 +02:00
  • d833c2d8de added builder class for JSONPointer, and implemented toString() and toURIFragment() Bence Erős 2016-05-03 23:18:05 +02:00
  • f21ffbe189 Update CDL.java Sean Leary 2016-05-02 22:12:29 -05:00
  • cad23423ab Update JSONObject.java Sean Leary 2016-05-02 22:11:20 -05:00
  • ebf08f5651 Merge pull request #226 from stleary/restore-1.6-compatibility Sean Leary 2016-05-01 22:59:29 -05:00
  • 77d0873abd Merge pull request #45 from captainIowa/master Sean Leary 2016-05-01 22:55:49 -05:00
  • f239dc75ad Merge pull request #219 from captainIowa/master Sean Leary 2016-05-01 22:55:13 -05:00
  • 052ce94a34 Update README.md Sean Leary 2016-05-01 22:53:53 -05:00
  • 4a3565afb3 unit test integration stleary 2016-05-01 22:47:23 -05:00
  • 1ca8933a8f fix to compile with 1.6.0_45 restore-1.6-compatibility stleary 2016-04-28 22:12:16 -05:00
  • cbb1546c53 README improvements for stleary/JSON-Java#218 Bence Erős 2016-04-28 16:45:17 +02:00
  • c1a789a70c adding missing license headers Bence Erős 2016-04-27 00:11:47 +02:00
  • bff352791c removed @author tag from JSONPointerException Bence Erős 2016-04-27 00:10:45 +02:00
  • 5223aadd67 added some javadoc to JSONPointer Bence Erős 2016-04-27 00:10:06 +02:00
  • 45bd72c15d added JSONObject#query() and JSONPointer#query() methods Bence Erős 2016-04-26 23:48:14 +02:00
  • 792c6f6a9c improved failure handling Bence Erős 2016-04-26 23:32:15 +02:00
  • e748c60eb1 tests for improved failure handling Bence Erős 2016-04-26 23:31:43 +02:00