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,389 Commits 11 Branches 25 Tags
9bb26bdb34ba746eb038abc856cf05dafbe4adf4
Commit Graph

1389 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sean Leary 633ab108e7 Update README.md 2015-12-28 12:22:29 -06:00
Sean Leary 472439546a Update README.md 2015-12-28 12:20:43 -06:00
Sean Leary cfec741090 Merge pull request #31 from stleary/json-path-for-validation 
Replace util compare method with JsonPath
 2015-12-28 12:11:47 -06:00
stleary abe421e6bb clean up code 2015-12-28 12:07:44 -06:00
stleary 48c872f66f Replace util compare method with JsonPath 2015-12-28 11:12:41 -06:00
stleary 7187006bae Replace util compare method with JsonPath 2015-12-27 17:01:42 -06:00
stleary d329b6514c Replace util compare method with JsonPath 2015-12-27 15:17:01 -06:00
stleary a5390a0685 Replace util compare method with JsonPath 2015-12-26 19:02:02 -06:00
stleary c6204a9f01 Replace util compare method with JsonPath 2015-12-26 13:21:06 -06:00
stleary 8688494876 change to public, write(writer, indentfactor, indent) 2015-12-23 19:53:30 -06:00
John J. Aylward 48302592cf Merge branch 'master' of https://github.com/douglascrockford/JSON-java 2015-12-09 10:07:36 -05:00
Sean Leary 03dd662e72 Merge pull request #180 from netheril96/my 
Remove executable bit
 2015-12-09 01:08:47 -06:00
Siyuan Ren 23cf659730 Remove executable permission bit from file mode 2015-12-09 09:50:59 +08:00
John J. Aylward ec8f649467 Merge branch 'master' of https://github.com/douglascrockford/JSON-java 2015-12-08 09:27:54 -05:00
Sean Leary 39e3ccc671 Update version 
Update version after merge of https://github.com/douglascrockford/JSON-java/pull/179
 2015-12-05 20:14:15 -06:00
Sean Leary 2ec538f420 Merge pull request #179 from andrew-fletcher/UpdateJavaDocForJSONOBject 
Remove throws JSONException JavaDoc from 2 methods that do not throw this exception.
 2015-12-05 20:11:40 -06:00
Andrew Fletcher cadba9400c Update JavaDoc for JSONObject Constructors 
Two JSONObject constructors incorrectly specify a @throws JSONException
tag in the JavaDoc for those constructors. Remove the relevant JavaDoc.
 2015-12-02 10:49:54 -08:00
Sean Leary 44275e3b3c Merge pull request #175 from douglascrockford/release-20151123 
Update readme for 20151123 release
20151123 		2015-11-24 01:53:19 -06:00
stleary 5f2e77f9dd Update readme with proposed release information 2015-11-21 11:50:31 -06:00
Sean Leary c578216844 Merge pull request #30 from stleary/confirmValueToStringFix 
Fix tabs, add valueToString() test to JSONObjectTest
 2015-10-31 04:00:52 -05:00
stleary 38cbc31624 Fix tabs, add valueToString() test to JSONObjectTest 2015-10-31 03:58:04 -05:00
Sean Leary a109f581c8 Update JSONArray.java 
Update version for https://github.com/douglascrockford/JSON-java/pull/153
 2015-10-29 18:25:27 -05:00
Sean Leary 33ae025e78 Update JSONObject.java 
Update version for https://github.com/douglascrockford/JSON-java/pull/153
 2015-10-29 18:24:46 -05:00
Sean Leary 6406c7a379 Merge pull request #28 from johnjaylward/FixCtorGenerics 
Test cases for PR #153 in JSON-Java
 2015-10-29 18:08:21 -05:00
Sean Leary 564ad2c2fb Merge pull request #153 from treyerl/master 
JSONObject and JSONArray initialization for Map<?,?> and Collection<?>
 2015-10-29 18:07:43 -05:00
Sean Leary dfd19116d3 Merge pull request #168 from douglascrockford/readme-maven-info 
Include latest Maven release information
 2015-10-29 18:04:31 -05:00
John J. Aylward 3850b5fd25 Add tests to verify arrays are handled consistently. 2015-10-26 18:35:53 -04:00
John J. Aylward 105426b53f Formatting 2015-10-26 18:35:40 -04:00
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