Commit Graph

1323 Commits

Author SHA1 Message Date
André Rouél
9e6f2bab20 Fix ArrayIndexOutOfBoundsException when skipping a value with JsonTreeReader #1013 (#1014) 2017-02-15 18:41:39 -08:00
Jake Wharton
7719e73a10 Merge pull request #1012 from BloodShura/master
All JsonElement::getAsJsonXXX methods now include the JSON string on thrown exception's message
2017-02-07 19:17:28 -05:00
BloodShura
9d8d7a43e1 All JsonElement::getAsJsonXXX methods now include the JSON string on thrown exception's message 2017-02-07 22:04:22 -02:00
Jesse Wilson
4a57ba6afd Merge pull request #999 from twlkyao/patch-1
Fixed typo
2017-01-22 12:05:55 -05:00
Shiyao Qi
614e735992 Fixed typo
Fixed typo
2017-01-22 18:00:33 +08:00
Martin Lind
08c7bffba0 Fix for #957 (#994) 2017-01-11 10:38:33 -08:00
Jake Wharton
d125fc78cc Merge pull request #982 from ytRino/fix-comma
Add missing comma in toString()
2016-12-20 10:21:10 -05:00
Yutaro Iino
9e5e4ac630 Add missing comma in toString() 2016-12-21 00:10:42 +09:00
Mark Hess
4976e420fc Add keySet method and test (#942) 2016-12-13 22:15:49 -08:00
Kevin Most
5f73666404 Update JsonAdapter documentation (#976)
Include mention of JsonDeserializer and JsonSerializer.
2016-12-11 22:37:55 -08:00
Egor Neliuba
44cad04a63 Allow deserialization of a Number represented as a String (#964) 2016-11-25 23:40:14 -08:00
inder123
791236ac79 Fixed https://github.com/google/gson/issues/958 2016-11-14 21:21:24 -08:00
Jake Wharton
a786628318 Version is actually 2.8.0 2016-11-08 11:17:33 -05:00
Jake Wharton
b1eeae53bc Merge pull request #955 from melquiadess/update-ver-in-maven-example
Update gson version to 2.8 in Maven example
2016-11-08 11:16:33 -05:00
Greg Koblanski (melquiades)
9a2d8a20a4 Update gson version used in the Maven example 2016-11-08 16:13:31 +00:00
jwilson
fca867d356 Fix GitHub Diff link. 2016-10-26 23:07:34 -07:00
jwilson
14c8c1a82b [maven-release-plugin] prepare for next development iteration 2016-10-26 23:01:41 -07:00
jwilson
e9ead40302 [maven-release-plugin] prepare release gson-parent-2.8.0 2016-10-26 23:01:37 -07:00
jwilson
512d7b83cd Changelog for Gson 2.8. 2016-10-26 23:01:07 -07:00
inder123
63a69ad132 Merge pull request #943 from fs-opensource/master
README.md Add a 2nd third party tutorial resource
2016-10-25 18:23:43 -07:00
Norman Peitek
61d46cb971 README.md Add a 2nd third party tutorial resource 2016-10-07 22:40:45 +02:00
Jesse Wilson
21ed8b4cd6 Merge pull request #930 from google/269_post_construct_adapter
Added PostConstruct Factory sample in Extras.
2016-10-03 19:46:58 -04:00
inder123
0636635cbf Merge pull request #931 from enhdless/master
Remove deprecated useDefaultManifestFile for jar plugin
2016-09-18 22:44:19 -07:00
Heidi Dong
e10442714e Remove deprecated useDefaultManifestFile for jar plugin 2016-09-17 00:23:49 -07:00
Inderjeet Singh
4512f31c69 Added PostConstruct Factory sample in Extras. 2016-09-16 17:35:34 -07:00
inder123
504d8240cc Merge pull request #922 from google/921
Added @Documented to Gson annotations.
2016-09-15 18:25:59 -07:00
Inderjeet Singh
688f918a35 Added @Documented to Gson annotations.
This is useful since it shows the JSON format for a class which the user of that class should typically know.
2016-09-15 18:24:21 -07:00
inder123
d08e077cfb Merge pull request #926 from ChaitanyaPramod/patch-1
Prevent Proguard from stripping interface info from @JsonAdapter classes
2016-09-14 16:54:11 -07:00
Chaitanya Pramod
74f4f74b8b Prevent Proguard from stripping interface info from @JsonAdapter classes
Previously after Proguard, the classes would no longer implement the interfaces, leading to `JsonAdapterAnnotationTypeAdapterFactory` throwing.

Fixes #925
2016-09-14 18:57:35 +05:30
inder123
2271525dd5 Merge pull request #900 from google/jw/array-and-parameterized-factories
Add static factories for array and parameterized type tokens.
2016-08-12 09:58:55 -07:00
Jake Wharton
9414b9b3b6 Add static factories for array and parameterized type tokens.
These are useful when creating TypeAdapterFactories that delegate to others with more complex types. They also are useful when writing dynamic code that deals with types that cannot be fully reified using the normal subclass technique.
2016-08-12 12:11:57 -04:00
inder123
8b464231f7 Merge pull request #881 from testcenter/master
made nullSafe wrapper of JsonAdapter optional
2016-07-03 01:53:19 -07:00
testcenter
193349f4aa made nullSafe wrapper of JsonAdapter optional 2016-06-28 09:18:03 +02:00
inder123
f482f4a1cb ChangeLog for 2.7 2016-06-14 17:22:32 -07:00
inder123
28c8e1c29b Updated to 2.7 2016-06-14 17:07:51 -07:00
Inderjeet Singh
0a29fcf859 [maven-release-plugin] prepare for next development iteration 2016-06-14 16:52:32 -07:00
Inderjeet Singh
9722b00372 [maven-release-plugin] prepare release gson-parent-2.7 2016-06-14 16:52:28 -07:00
inder123
86765d2331 Merge pull request #875 from google/gson_2.7
Preparing 2.7-SNAPSHOT to cut the 2.7 release.
2016-06-14 16:46:57 -07:00
Inderjeet Singh
687ddb319e Preparing 2.7-SNAPSHOT to cut the 2.7 release. 2016-06-14 16:39:19 -07:00
inder123
b2c00a3b02 Merge pull request #873 from google/jwilson.0601.get_delegate_adapter
Add support for JsonSerializer/JsonDeserializer in the JsonAdapter annotation
2016-06-14 16:37:14 -07:00
Inderjeet Singh
1f859ec769 addressed code review comments. 2016-06-14 16:34:34 -07:00
Jesse Wilson
c24af30407 Merge pull request #871 from google/jw/tree-json-path
Implement JSON Path for JsonTreeReader.
2016-06-09 23:32:24 -07:00
Jesse Wilson
5f63fcec98 Merge pull request #872 from google/jw/object-size
Expose JsonObject size.
2016-06-09 23:06:50 -07:00
Jake Wharton
c16be41e77 Expose JsonObject size. 2016-06-10 00:46:32 -04:00
Jake Wharton
c2fae85a9f Implement JSON Path for JsonTreeReader. 2016-06-10 00:14:28 -04:00
inder123
ebad966efd Merge pull request #870 from google/jw/reader-location
Consolidate location and path rendering for exceptions.
2016-06-09 15:26:10 -07:00
Jake Wharton
ecaa57114f Consolidate location and path rendering for exceptions. 2016-06-09 18:02:36 -04:00
jwilson
86ccf826fc Merge branch 'deyboy90-master'
* deyboy90-master:
  Enhancing the json reader, adding corresponding test case for it
2016-06-02 09:20:06 -04:00
Archit Dey
3f8726ecaf Enhancing the json reader, adding corresponding test case for it 2016-06-02 09:19:43 -04:00
jwilson
2df65502ed Don't use ThreadLocals for @JsonAdapter factories and getDelegateAdapter(). 2016-06-02 00:33:09 -04:00