STREAMS-458: GPlus Person Deserializer - fix conflict merge problem
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/0151714b Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/0151714b Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/0151714b Branch: refs/heads/master Commit: 0151714bf9a3feec9e0d0ca92d8598e90d07ac62 Parents: ac60c5f Author: Steve Blackmon @steveblackmon <sblack...@apache.org> Authored: Tue Nov 29 19:33:09 2016 -0600 Committer: Steve Blackmon @steveblackmon <sblack...@apache.org> Committed: Tue Nov 29 19:33:09 2016 -0600 ---------------------------------------------------------------------- .../com/google/gplus/serializer/util/GPlusPersonDeserializer.java | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/0151714b/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/serializer/util/GPlusPersonDeserializer.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/serializer/util/GPlusPersonDeserializer.java b/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/serializer/util/GPlusPersonDeserializer.java index 19e1d76..871e15b 100644 --- a/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/serializer/util/GPlusPersonDeserializer.java +++ b/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/serializer/util/GPlusPersonDeserializer.java @@ -27,6 +27,7 @@ import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.IntNode; import com.google.api.client.util.Lists; import com.google.api.services.plus.model.Person;
