erik/JSON-java
erik/JSON-java
1
0
Fork 0
mirror of https://github.com/ethauvin/JSON-java.git synced 2025-06-18 00:10:51 -07:00
Code Releases Activity
761 commits 11 branches 11 tags 1.9 MiB
Commit graph

761 commits

This branch
This branch
All branches
Author SHA1 Message Date
John J. Aylward
7886c96204 Changes JSONArray for loops to use the new iterators. 2015-10-26 18:30:41 -04:00
John J. Aylward
91c6f09be8 Modifies XML output to be handled the same for a native java array as well as a JSONArray. 2015-10-26 18:17:37 -04:00
stleary
a07d391eae Include latest Maven release information 2015-10-25 11:05:16 -05:00
Sean Leary
e7f4eb5f67 Set version date to match commit date, convert tabs to spaces. 2015-10-18 11:05:29 -05:00
Sean Leary
b0a9507add Merge pull request #159 from johnjaylward/FixExceptionInheritance 
Properly overrides the Exception class.
 2015-10-18 11:02:11 -05:00
Sean Leary
0dbd9be0f1 Merge pull request #26 from johnjaylward/FixXMLNPE 
Fixes NPE in XML for pull request #160 in the json-java project
 2015-10-18 10:45:42 -05:00
Sean Leary
6757e04c0a Fix NullPointerException in XML.toString(object, tagName) 
Setting version date to match commit date.
 2015-10-18 10:23:43 -05:00
Sean Leary
09b6af4712 Merge pull request #160 from johnjaylward/FixXMLNPE 
Fixes possible NullPointerException in XML.toString(object, tagName)
 2015-10-18 10:21:36 -05:00
John J. Aylward
4a2f9b8cd3 Adds test cases for corrected generic constructors and put methods 2015-10-14 15:15:24 -04:00
John Aylward
637c1fe2b9 updates file dates 2015-10-14 00:48:01 -04:00
John Aylward
1448163981 fixes file date 2015-10-14 00:41:38 -04:00
Lukas Treyer
5ddc515679 removed 6 unnecessary @SuppressWarnings("unchecked") annotations. 2015-10-12 23:52:14 +02:00
John J. Aylward
1b06a802cf makes params final 2015-10-12 14:54:30 -04:00
John J. Aylward
0e13241528 Expands javadoc 2015-10-12 14:53:03 -04:00
John J. Aylward
e239e1967a Allows a custom message to be passed with a cause. 2015-10-12 14:52:17 -04:00
John J. Aylward
cb63a968fa fixes test case to validate the input/output of the function being tested 2015-10-12 14:49:18 -04:00
John J. Aylward
4b0db65877 Fixes NPE in XML 2015-10-12 14:33:43 -04:00
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 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