Backups/JSON-java
1
0
Fork 0
mirror of https://github.com/stleary/JSON-java.git synced 2026-04-05 00:00:46 -04:00
Code Issues Projects Releases Wiki Activity
1,294 Commits 11 Branches 25 Tags
d3c7eaf17e8ca0162d344c3e98ef270b8164cc69
Commit Graph

1294 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John J. Aylward ceba8e8c3d Fixes possible NPE 2015-10-12 14:25:18 -04:00
John J. Aylward 4e77383472 Properly overrides the Exception class. 2015-10-12 14:23:05 -04:00
Lukas Treyer 25b5aa7ef2 changed Map<String, ?> method parameters to Map<?,?> 
changed Iterator to foreach loop in JSONArray ctor
JSONArray(Collection<?> collection) and JSONObject ctor
JSONObject(Map<?,?> map)
 2015-10-11 12:21:12 +02:00
Lukas Treyer 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.

JSONArray:
	- put(Collection<?> value) {...}
	- put(Map<String, ?> value) {...}
	- put(int index, Collection<?> value) throws JSONException {...}
	- put(int index, Map<String, ?> value) throws JSONException {...}

JSONObject:
	- put(String key, Collection<?> value) throws JSONException {...}
	- put(String key, Map<String, ?> value) throws JSONException {...}


Changed all code affected by new JSONObject and JSONArray constructors:
	
JSONObject:
	- valueToString(Object value) throws JSONException {
		- value instanceof Map
		- value instanceof Collection
	  }
	- wrap(Object object) {
		- value instanceof Map
		- value instanceof Collection
	  }
	- writeValue(Writer writer, Object value,
			 int indentFactor, int indent){
        - value instanceof Map
        - value instanceof Collection
      }
 2015-10-11 11:20:08 +02:00
Lukas Treyer 0afd26623c JSONObject and JSONArray initialization: 
JSONObject(Map<String, ?> map) allows to initialize the JSONObject with
a Map<String, String>

JSONArray(Collection<?> collection) allows to initialize a JSONArray
with a Collection<JSONObject>
 2015-10-04 23:17:30 +02:00
stleary 1a5718dc39 Commenting out some code until JSON-java supports XML.toJSONObject(Reader) 2015-09-27 23:55:32 -05:00
Sean Leary 3f78a85908 Merge pull request #22 from stleary/xml-reader-remote 
sample tests for XML.toJSONObject(Reader)
 2015-08-23 20:08:02 -05:00
Sean Leary 9dd0ca7b81 Merge pull request #23 from seanThomasLeary/master 
Update README.md
 2015-08-23 18:54:54 -05:00
seanThomasLeary 045fc74688 Update README.md 2015-08-23 18:54:10 -05:00
stleary 1f6e07c914 sample tests for XML.toJSONObject(Reader) 2015-08-19 19:16:22 -05:00
stleary 8f71e01ae3 Add method comments so JavaDoc will pick them up. 2015-08-09 18:30:16 -05:00
stleary ccbec8127c Added some class documentation 2015-08-09 18:24:47 -05:00
stleary 1081ae092b Move method comments so JavaDoc will pick them up. 2015-08-09 18:19:51 -05:00
stleary 58d72fe20f Verify exception messages. Move method comments so JavaDoc will pick them up. 2015-08-09 18:19:32 -05:00
stleary 8e48caeb3d Verify exception messages. Move method comments so JavaDoc will pick them up. 2015-08-08 15:12:20 -05:00
stleary 4a3bbedc32 Verify exception messages. Move method comments so JavaDoc will pick them up. 2015-08-08 14:09:52 -05:00
stleary 41bfdad91f Move method comments so JavaDoc will pick them up. 2015-08-08 12:10:52 -05:00
stleary 6f5bcb32e5 Unit tests for JSON-Java HTTP.java. See RFC7230 2015-08-08 12:10:18 -05:00
stleary 9ce62b9540 Move method comments so JavaDoc will pick them up. 2015-08-08 10:30:20 -05:00
stleary f66cc8d5c4 Verify exception messages. Move method comments so JavaDoc will pick them up. 2015-08-08 10:22:17 -05:00
stleary a0108f3e8e Verify exception messages. Move method comments so JavaDoc will pick them up. 2015-08-08 09:32:15 -05:00
stleary ee0a53d494 Verify exception messages. Move method comments so JavaDoc will pick them up. 2015-08-08 08:13:22 -05:00
Sean Leary b0191a6acf Update README 20150729 2015-07-29 19:50:14 -05:00
Sean Leary ce2de45f64 Merge pull request #140 from douglascrockford/enum-support 
Enum support
 2015-07-28 19:33:29 -05:00
stleary f69466f4c2 recreate original documented issue 2015-07-22 21:21:23 -05:00
stleary 1f4e836863 few more enum support tests 2015-07-22 20:24:45 -05:00
stleary 5fc22e32a8 fix edit dates for enum support 2015-07-22 20:18:30 -05:00
stleary 9785b4ff0b enum support 2015-07-22 20:16:02 -05:00
stleary 8ac8c34e9f tests for enum-support 2015-07-22 20:12:10 -05:00
stleary ca3001629a latest 2015-07-22 20:11:07 -05:00
stleary ec7eb25565 Merge branch 'master' of github.com:stleary/JSON-Java-unit-test 2015-07-22 19:47:38 -05:00
stleary 4e38ed01e5 tests for enum-support 2015-07-22 19:47:12 -05:00
Sean Leary 752f66746b Update README.md 2015-07-21 09:12:16 -05:00
stleary 0361cc58d6 one more test - and a bug? 2015-07-20 23:31:52 -05:00
stleary b39c3df766 document behavior of content keyword 2015-07-20 23:14:15 -05:00
Sean Leary 96b2e38459 Update README 2015-07-20 10:02:21 -05:00
stleary b9c6f335ee fixed comment location 2015-07-19 09:04:10 -05:00
stleary f48b6439f6 manual merge of pull request #18 2015-07-19 09:02:27 -05:00
stleary 2c026eb5f8 Fixed test shouldHandleIllegalJSONNodeNames 2015-07-19 08:56:20 -05:00
Sean Leary 0d2d0e3f6c Merge pull request #19 from JaXt0r/illegal_JSON-node-names_during_conversion_to_XML 
Showing issue of illegal node names with possible underscore-replacement. (Will currently assterted to an Exception).
 2015-07-19 08:48:32 -05:00
JaXt0r 5eadebb797 Showing issue of illegal node names with possible underscore-replacement. (Will currently assterted to an Exception). 2015-07-19 14:24:06 +02:00
stleary 16fa69c0f6 investigate XML.toString() behavior with null JSONObject values 2015-07-17 22:04:01 -05:00
stleary b06182cb73 investigate XML.toString() behavior with null JSONObject values 2015-07-17 22:01:52 -05:00
stleary 0056b1af94 investigate XML.toString() behavior with null JSONObject values 2015-07-17 21:58:42 -05:00
stleary 6cca292020 investigate XML.toString() behavior with null JSONObject values 2015-07-17 21:55:50 -05:00
Sean Leary 4f8b25d527 Merge pull request #135 from douglascrockford/big-numbers 
Proposed BigInteger, BigDecimal support
 2015-07-11 12:52:36 -05:00
Sean Leary ab143af146 Update README.md 2015-07-07 23:20:55 -05:00
Sean Leary 27b22b4724 Update README.md 2015-07-07 23:19:37 -05:00
Sean Leary 7ed1f78f5f Update README.md 2015-07-07 23:18:31 -05:00
Sean Leary 6dd85ad5b6 Update README.md 2015-07-07 23:16:18 -05:00