Commit Graph

  • 757fd566ab Merge pull request #170 from johnjaylward/HandleArraysConsistently Sean Leary 2016-01-01 13:44:57 -06:00
  • e6f5047742 Merge pull request #185 from douglascrockford/write-with-indent-params Sean Leary 2015-12-30 15:06:07 -06:00
  • dc8c9e382d Merge pull request #35 from stleary/more-todo-cleanup Sean Leary 2015-12-30 13:52:55 -06:00
  • 871a3e46d7 clean up a few more todos stleary 2015-12-30 13:50:51 -06:00
  • 4df6984233 Merge pull request #34 from stleary/util-cleanup Sean Leary 2015-12-30 01:03:31 -06:00
  • c88d06eede util cleanup stleary 2015-12-30 01:01:43 -06:00
  • 0dc886d11b Merge pull request #33 from stleary/Fix-todos-and-cleanup Sean Leary 2015-12-30 00:03:37 -06:00
  • fc318a765c Fix some todos, clean up some tests, improve coverage stleary 2015-12-30 00:00:58 -06:00
  • 0990f340db Update README.md Sean Leary 2015-12-30 00:00:14 -06:00
  • 4ddd6a19a7 Merge pull request #32 from stleary/refactor-test-classes-from-JSONObjectTest Sean Leary 2015-12-29 18:01:35 -06:00
  • 7f83a51718 refactor test classes to their own modules stleary 2015-12-29 17:56:43 -06:00
  • 95cf86688d Update README.md Sean Leary 2015-12-28 12:25:40 -06:00
  • 91fcd6092f Update README.md Sean Leary 2015-12-28 12:25:11 -06:00
  • 54cd97ded1 Update README.md Sean Leary 2015-12-28 12:24:46 -06:00
  • 633ab108e7 Update README.md Sean Leary 2015-12-28 12:22:29 -06:00
  • 472439546a Update README.md Sean Leary 2015-12-28 12:20:43 -06:00
  • cfec741090 Merge pull request #31 from stleary/json-path-for-validation Sean Leary 2015-12-28 12:11:47 -06:00
  • abe421e6bb clean up code stleary 2015-12-28 12:07:44 -06:00
  • 48c872f66f Replace util compare method with JsonPath stleary 2015-12-28 11:12:41 -06:00
  • 7187006bae Replace util compare method with JsonPath stleary 2015-12-27 17:01:42 -06:00
  • d329b6514c Replace util compare method with JsonPath stleary 2015-12-27 15:17:01 -06:00
  • a5390a0685 Replace util compare method with JsonPath stleary 2015-12-26 19:02:02 -06:00
  • c6204a9f01 Replace util compare method with JsonPath stleary 2015-12-26 13:21:06 -06:00
  • 8688494876 change to public, write(writer, indentfactor, indent) stleary 2015-12-23 19:53:30 -06:00
  • 48302592cf Merge branch 'master' of https://github.com/douglascrockford/JSON-java John J. Aylward 2015-12-09 10:07:36 -05:00
  • 03dd662e72 Merge pull request #180 from netheril96/my Sean Leary 2015-12-09 01:08:47 -06:00
  • 23cf659730 Remove executable permission bit from file mode Siyuan Ren 2015-12-09 01:50:59 +00:00
  • ec8f649467 Merge branch 'master' of https://github.com/douglascrockford/JSON-java John J. Aylward 2015-12-08 09:27:54 -05:00
  • 39e3ccc671 Update version Sean Leary 2015-12-05 20:14:15 -06:00
  • 2ec538f420 Merge pull request #179 from andrew-fletcher/UpdateJavaDocForJSONOBject Sean Leary 2015-12-05 20:11:40 -06:00
  • cadba9400c Update JavaDoc for JSONObject Constructors Andrew Fletcher 2015-12-02 10:49:54 -08:00
  • 44275e3b3c Merge pull request #175 from douglascrockford/release-20151123 Sean Leary 2015-11-24 01:53:19 -06:00
  • 5f2e77f9dd Update readme with proposed release information stleary 2015-11-21 11:50:31 -06:00
  • c578216844 Merge pull request #30 from stleary/confirmValueToStringFix Sean Leary 2015-10-31 04:00:52 -05:00
  • 38cbc31624 Fix tabs, add valueToString() test to JSONObjectTest stleary 2015-10-31 03:58:04 -05:00
  • a109f581c8 Update JSONArray.java Sean Leary 2015-10-29 18:25:27 -05:00
  • 33ae025e78 Update JSONObject.java Sean Leary 2015-10-29 18:24:46 -05:00
  • 6406c7a379 Merge pull request #28 from johnjaylward/FixCtorGenerics Sean Leary 2015-10-29 18:08:21 -05:00
  • 564ad2c2fb Merge pull request #153 from treyerl/master Sean Leary 2015-10-29 18:07:43 -05:00
  • dfd19116d3 Merge pull request #168 from douglascrockford/readme-maven-info Sean Leary 2015-10-29 18:04:31 -05:00
  • 3850b5fd25 Add tests to verify arrays are handled consistently. John J. Aylward 2015-10-26 18:35:53 -04:00
  • 105426b53f Formatting John J. Aylward 2015-10-26 18:35:40 -04:00
  • 7886c96204 Changes JSONArray for loops to use the new iterators. John J. Aylward 2015-10-26 18:30:41 -04:00
  • 91c6f09be8 Modifies XML output to be handled the same for a native java array as well as a JSONArray. John J. Aylward 2015-10-26 18:17:37 -04:00
  • a07d391eae Include latest Maven release information stleary 2015-10-25 11:05:16 -05:00
  • e7f4eb5f67 Set version date to match commit date, convert tabs to spaces. Sean Leary 2015-10-18 11:05:29 -05:00
  • b0a9507add Merge pull request #159 from johnjaylward/FixExceptionInheritance Sean Leary 2015-10-18 11:02:11 -05:00
  • 0dbd9be0f1 Merge pull request #26 from johnjaylward/FixXMLNPE Sean Leary 2015-10-18 10:45:42 -05:00
  • 6757e04c0a Fix NullPointerException in XML.toString(object, tagName) Sean Leary 2015-10-18 10:23:43 -05:00
  • 09b6af4712 Merge pull request #160 from johnjaylward/FixXMLNPE Sean Leary 2015-10-18 10:21:36 -05:00
  • 4a2f9b8cd3 Adds test cases for corrected generic constructors and put methods John J. Aylward 2015-10-14 15:15:24 -04:00
  • 637c1fe2b9 updates file dates John Aylward 2015-10-14 00:48:01 -04:00
  • 1448163981 fixes file date John Aylward 2015-10-14 00:41:38 -04:00
  • 5ddc515679 removed 6 unnecessary @SuppressWarnings("unchecked") annotations. Lukas Treyer 2015-10-12 23:52:14 +02:00
  • 1b06a802cf makes params final John J. Aylward 2015-10-12 14:54:30 -04:00
  • 0e13241528 Expands javadoc John J. Aylward 2015-10-12 14:53:03 -04:00
  • e239e1967a Allows a custom message to be passed with a cause. John J. Aylward 2015-10-12 14:52:17 -04:00
  • cb63a968fa fixes test case to validate the input/output of the function being tested John J. Aylward 2015-10-12 14:49:18 -04:00
  • 4b0db65877 Fixes NPE in XML John J. Aylward 2015-10-12 13:48:05 -04:00
  • ceba8e8c3d Fixes possible NPE John J. Aylward 2015-10-12 13:41:15 -04:00
  • 4e77383472 Properly overrides the Exception class. John J. Aylward 2015-10-12 12:11:30 -04:00
  • 25b5aa7ef2 changed Map<String, ?> method parameters to Map<?,?> Lukas Treyer 2015-10-11 12:21:12 +02:00
  • 409eb9f292 changed all method signatures containing collections and maps to accept wildcard generic types, e.g. Collection<?> instead of Collection<Object>. This was proposed by other pull requests (#111, #112) already. Consider this commit as merge with #111 and #112. Lukas Treyer 2015-10-11 11:20:08 +02:00
  • 0afd26623c JSONObject and JSONArray initialization: Lukas Treyer 2015-10-04 23:17:30 +02:00
  • 1a5718dc39 Commenting out some code until JSON-java supports XML.toJSONObject(Reader) stleary 2015-09-27 23:55:32 -05:00
  • 3f78a85908 Merge pull request #22 from stleary/xml-reader-remote Sean Leary 2015-08-23 20:08:02 -05:00
  • 9dd0ca7b81 Merge pull request #23 from seanThomasLeary/master Sean Leary 2015-08-23 18:54:54 -05:00
  • 045fc74688 Update README.md seanThomasLeary 2015-08-23 18:54:10 -05:00
  • 1f6e07c914 sample tests for XML.toJSONObject(Reader) stleary 2015-08-19 19:16:22 -05:00
  • 8f71e01ae3 Add method comments so JavaDoc will pick them up. stleary 2015-08-09 18:30:16 -05:00
  • ccbec8127c Added some class documentation stleary 2015-08-09 18:24:47 -05:00
  • 1081ae092b Move method comments so JavaDoc will pick them up. stleary 2015-08-09 18:19:51 -05:00
  • 58d72fe20f Verify exception messages. Move method comments so JavaDoc will pick them up. stleary 2015-08-09 18:19:32 -05:00
  • 8e48caeb3d Verify exception messages. Move method comments so JavaDoc will pick them up. stleary 2015-08-08 15:12:20 -05:00
  • 4a3bbedc32 Verify exception messages. Move method comments so JavaDoc will pick them up. stleary 2015-08-08 14:09:52 -05:00
  • 41bfdad91f Move method comments so JavaDoc will pick them up. stleary 2015-08-08 12:10:52 -05:00
  • 6f5bcb32e5 Unit tests for JSON-Java HTTP.java. See RFC7230 stleary 2015-08-08 12:10:18 -05:00
  • 9ce62b9540 Move method comments so JavaDoc will pick them up. stleary 2015-08-08 10:30:20 -05:00
  • f66cc8d5c4 Verify exception messages. Move method comments so JavaDoc will pick them up. stleary 2015-08-08 10:22:17 -05:00
  • a0108f3e8e Verify exception messages. Move method comments so JavaDoc will pick them up. stleary 2015-08-08 09:32:15 -05:00
  • ee0a53d494 Verify exception messages. Move method comments so JavaDoc will pick them up. stleary 2015-08-08 08:13:22 -05:00
  • b0191a6acf Update README Sean Leary 2015-07-29 19:50:14 -05:00
  • ce2de45f64 Merge pull request #140 from douglascrockford/enum-support Sean Leary 2015-07-28 19:33:29 -05:00
  • f69466f4c2 recreate original documented issue stleary 2015-07-22 21:21:23 -05:00
  • 1f4e836863 few more enum support tests stleary 2015-07-22 20:24:45 -05:00
  • 5fc22e32a8 fix edit dates for enum support stleary 2015-07-22 20:18:30 -05:00
  • 9785b4ff0b enum support stleary 2015-07-22 20:16:02 -05:00
  • 8ac8c34e9f tests for enum-support stleary 2015-07-22 20:12:10 -05:00
  • ca3001629a latest stleary 2015-07-22 20:11:07 -05:00
  • ec7eb25565 Merge branch 'master' of github.com:stleary/JSON-Java-unit-test stleary 2015-07-22 19:47:38 -05:00
  • 4e38ed01e5 tests for enum-support stleary 2015-07-22 19:47:12 -05:00
  • 752f66746b Update README.md Sean Leary 2015-07-21 09:12:16 -05:00
  • 0361cc58d6 one more test - and a bug? stleary 2015-07-20 23:31:52 -05:00
  • b39c3df766 document behavior of content keyword stleary 2015-07-20 23:14:15 -05:00
  • 96b2e38459 Update README Sean Leary 2015-07-20 10:02:21 -05:00
  • b9c6f335ee fixed comment location stleary 2015-07-19 09:04:10 -05:00
  • f48b6439f6 manual merge of pull request #18 stleary 2015-07-19 09:02:27 -05:00
  • 2c026eb5f8 Fixed test shouldHandleIllegalJSONNodeNames stleary 2015-07-19 08:56:20 -05:00
  • 0d2d0e3f6c Merge pull request #19 from JaXt0r/illegal_JSON-node-names_during_conversion_to_XML Sean Leary 2015-07-19 08:48:32 -05:00
  • 5eadebb797 Showing issue of illegal node names with possible underscore-replacement. (Will currently assterted to an Exception). JaXt0r 2015-07-19 14:24:06 +02:00