Repository: jclouds Updated Branches: refs/heads/master 15ea6929a -> da4614e72
JCLOUDS-1160: Upgrade to Gson 2.7 Changelog: https://github.com/google/gson/blob/master/CHANGELOG.md Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/da4614e7 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/da4614e7 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/da4614e7 Branch: refs/heads/master Commit: da4614e72ce17999afbe54ae32879f27a59d8c5c Parents: 15ea692 Author: Andrew Gaul <[email protected]> Authored: Sat Aug 27 18:03:07 2016 -0700 Committer: Andrew Gaul <[email protected]> Committed: Mon Aug 29 19:54:44 2016 -0700 ---------------------------------------------------------------------- core/pom.xml | 2 +- ...eserializationConstructorAndReflectiveTypeAdapterFactory.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/da4614e7/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index ff5895f..96fe420 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -80,7 +80,7 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>2.3.1</version> + <version>2.7</version> </dependency> <dependency> <groupId>com.google.guava</groupId> http://git-wip-us.apache.org/repos/asf/jclouds/blob/da4614e7/core/src/main/java/org/jclouds/json/internal/DeserializationConstructorAndReflectiveTypeAdapterFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/json/internal/DeserializationConstructorAndReflectiveTypeAdapterFactory.java b/core/src/main/java/org/jclouds/json/internal/DeserializationConstructorAndReflectiveTypeAdapterFactory.java index 852a1a1..603a436 100644 --- a/core/src/main/java/org/jclouds/json/internal/DeserializationConstructorAndReflectiveTypeAdapterFactory.java +++ b/core/src/main/java/org/jclouds/json/internal/DeserializationConstructorAndReflectiveTypeAdapterFactory.java @@ -41,6 +41,7 @@ import com.google.gson.TypeAdapter; import com.google.gson.TypeAdapterFactory; import com.google.gson.internal.ConstructorConstructor; import com.google.gson.internal.Excluder; +import com.google.gson.internal.bind.JsonAdapterAnnotationTypeAdapterFactory; import com.google.gson.internal.bind.ReflectiveTypeAdapterFactory; import com.google.gson.reflect.TypeToken; import com.google.gson.stream.JsonReader; @@ -114,7 +115,8 @@ public final class DeserializationConstructorAndReflectiveTypeAdapterFactory imp this.constructorFieldNamingPolicy = checkNotNull(deserializationFieldNamingPolicy, "deserializationFieldNamingPolicy"); this.delegateFactory = new ReflectiveTypeAdapterFactory(constructorConstructor, checkNotNull( - serializationFieldNamingPolicy, "fieldNamingPolicy"), checkNotNull(excluder, "excluder")); + serializationFieldNamingPolicy, "fieldNamingPolicy"), checkNotNull(excluder, "excluder"), + new JsonAdapterAnnotationTypeAdapterFactory(constructorConstructor)); } public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type) {
