Commit Graph

1221 Commits

Author SHA1 Message Date
Inderjeet Singh
fef43b2aaa Added support to serialize/deserialize ConcurrentMap and ConcurrentNavigableMap. 2015-11-04 21:25:15 -08:00
Jesse Wilson
9e5f86d10b Merge pull request #729 from google/jdk6
updated minimum JDK version to 1.6.
2015-11-04 22:24:05 -05:00
Inderjeet Singh
79e1c669ed Linking to JDK 6 javadocs 2015-11-04 18:55:23 -08:00
Inderjeet Singh
e5b3f6368d updated minimum JDK version to 1.6.
Added Overrides for methods implementing an interface.
2015-11-04 18:52:20 -08:00
Jesse Wilson
55b4a3f9b0 Merge pull request #724 from cconroy/threadsafe-cache
Thread safe method cache
2015-10-28 19:59:23 -04:00
Chris Conroy
7abeb16080 Thread safe method cache 2015-10-28 17:41:56 -04:00
inder123
fe101c10bc Merge pull request #719 from google/jwilson_1021_runtime_type_mismatch
Fix type hierarchy adapters to do a runtime check.
2015-10-22 09:29:01 -07:00
jwilson
7d1973e6c5 Fix type hierarchy adapters to do a runtime check.
Otherwise if we have a type hierarchy adapter for Vehicle, and we
attempt to decode a JSON string as a Car, we get the right exception
if the JSON string is actually decoded as a Truck.
2015-10-21 11:42:30 -04:00
inder123
10714ef042 Merge pull request #715 from Bhasmithal/master
Moved the .gitignore file to a more appropriate place
2015-10-21 00:07:58 -07:00
Emmanuel Cron
83aa8ca555 Merge https://github.com/google/gson 2015-10-20 12:09:17 -07:00
Emmanuel Cron
e3fe3c9430 Moved the .gitignore file to a more appropriate place 2015-10-20 12:07:51 -07:00
inder123
8cf538169c Updated proguard.cfg example to Gson only settings
Fixed https://github.com/google/gson/issues/713
2015-10-18 10:21:32 -07:00
inder123
2b15334a49 Merge pull request #710 from Bhasmithal/master
Updating the ProtoTypeAdapter to support custom field names/values annotations
2015-10-06 23:10:24 -07:00
Emmanuel Cron
503a9e536a Updating Gson version to 2.4 2015-10-06 22:52:01 -07:00
Emmanuel Cron
1ffa2fb92a Added rebuilt tests for serialization with numbers 2015-10-06 17:03:48 -07:00
Emmanuel Cron
51458c6c80 Added .gitignore; generated folder does not need to be pushed 2015-10-06 17:02:12 -07:00
Emmanuel Cron
b395da26b7 Better javadoc 2015-10-06 16:57:13 -07:00
Emmanuel Cron
21d7f0681e Removed useless <execution> 2015-10-06 16:44:46 -07:00
Emmanuel Cron
324ea17d46 Updated version 2015-10-06 16:43:38 -07:00
Emmanuel Cron
339c783b4a Updated the ProtoTypeAdapter to a version that works smoothly and supports field name/value customization.
- Lets you customize the proto field name serialization per field
    - Lets you use different cases for serialization (e.g. you could use UpperCamelCase for your proto field names and willing to serialize them using LowerHyphen)
    - Lets you choose to serialize enum values with their value (0, 1, 2, ...) instead of their name.
2015-10-06 16:20:37 -07:00
Jesse Wilson
51082b4759 Merge pull request #709 from roman-mazur/patch-1
Fix javadoc of SerializedName
2015-10-04 15:11:20 -04:00
Roman Mazur
3b1671dde9 Fix javadoc of SerializedName
In #699 the approach was changed but docs were left for the first implementation.
2015-10-04 19:56:02 +03:00
Jesse Wilson
095ebbd5a1 Update CHANGELOG.md 2015-10-04 01:31:09 -04:00
Jesse Wilson
1d8f3e56d8 Update CHANGELOG.md 2015-10-04 01:30:43 -04:00
inder123
25dff9b6ad updated to 2.4 release
using apidocs from github pages
2015-10-03 17:58:57 -07:00
Inderjeet Singh
d0ee733c96 [maven-release-plugin] prepare for next development iteration 2015-10-03 17:38:26 -07:00
Inderjeet Singh
80c13447ed [maven-release-plugin] prepare release gson-parent-2.4 2015-10-03 17:38:17 -07:00
Inderjeet Singh
d1883b5e5b added relativePath to avoid warning about incorrect parent path 2015-10-03 17:37:14 -07:00
Inderjeet Singh
4a5735504c fixed pom and .gitignore 2015-10-03 17:27:25 -07:00
Inderjeet Singh
157b2323a7 Created top-level pom to allow maven release to work 2015-10-03 17:25:20 -07:00
Jesse Wilson
cb6de2beec Merge pull request #699 from google/639
Implemented support for multiple values for SerializedName annotation.
2015-10-03 07:25:47 -04:00
Inderjeet Singh
109915d93a Implemented support for multiple values for SerializedName annotation. 2015-10-03 02:01:30 -07:00
Jesse Wilson
3361030766 Merge pull request #705 from google/627
Implemented equals and hashcode for LazilyParsedNumber to fix
2015-09-27 17:25:04 -04:00
Inderjeet Singh
96b2ada79a incorporated code review feedback: optimized LazilyParsedNumber.equals/hashcode() by utilizing the fact that value is never passed as null. 2015-09-27 13:58:01 -07:00
Jesse Wilson
9b6a381202 Merge pull request #707 from dushmis/master
typo
2015-09-27 10:51:25 -04:00
dushyant
2ecce94494 typo 2015-09-27 16:01:27 +05:30
inder123
8e1da9cf1a Merge pull request #706 from google/623
Fixed javadoc for JsonWriter as reported in
2015-09-26 18:11:07 -07:00
Inderjeet Singh
1e9004403c Fixed javadoc for JsonWriter as reported in
https://github.com/google/gson/issues/623
2015-09-26 18:10:00 -07:00
Inderjeet Singh
3aec173243 small reformatting 2015-09-26 18:02:12 -07:00
Inderjeet Singh
3daf585931 Implemented equals and hashcode for LazilyParsedNumber to fix
https://github.com/google/gson/issues/627
2015-09-26 17:58:13 -07:00
jwilson
93605e7145 Changelog fixes. 2015-09-26 19:47:17 -04:00
jwilson
40ba05529d Add a draft of a changelog. 2015-09-26 19:43:55 -04:00
Jake Wharton
b82e1b0931 Merge pull request #704 from google/jw/new-json-writer
Expose newJsonWriter wrapper instead of just options.
2015-09-26 19:26:16 -04:00
Jake Wharton
e81f3eba27 Expose newJsonWriter wrapper instead of just options.
This is more future proof to ensure that consumers holding on to TypeAdapters for efficiency can always encode JSON in the same way as if the Gson instance was used directly.
2015-09-26 19:19:38 -04:00
Jake Wharton
31f80d8659 Merge pull request #700 from google/jwilson_0907_serializenulls_accessor
Expose serializeNulls with an accessor.
2015-09-07 22:44:05 -04:00
jwilson
ff2c8f8e8b Expose serializeNulls with an accessor.
Useful for frameworks that build on Gson.
2015-09-07 22:31:43 -04:00
inder123
39b5d487d2 Merge pull request #698 from google/maven-update
updated maven plugin versions to latest
2015-09-07 12:10:39 -07:00
Inderjeet Singh
1bf62f0214 updated maven plugin versions to latest 2015-09-07 12:02:45 -07:00
Jesse Wilson
aa107894dd Merge pull request #694 from Dorvaryn/delegate_type_adapter_is_order_dependent
getDelegateAdapter is order dependant and skips more than one typeAdapterFactory.
2015-09-03 22:17:23 -04:00
Dorvaryn
618343fd1b Clarify the fact that the behaviour of getDelegateAdapter depends on registration order. 2015-09-03 18:15:24 +01:00