fix failing ITs
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/ee1d3c09 Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/ee1d3c09 Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/ee1d3c09 Branch: refs/heads/master Commit: ee1d3c0956285f05aa7f69393267595da071b02f Parents: 770a8cb Author: Steve Blackmon @steveblackmon <[email protected]> Authored: Fri Oct 14 18:38:47 2016 -0500 Committer: Steve Blackmon @steveblackmon <[email protected]> Committed: Fri Oct 14 18:38:47 2016 -0500 ---------------------------------------------------------------------- .../util/GPlusActivityDeserializer.java | 29 ++++++++++---------- .../util/GPlusPersonDeserializer.java | 12 ++++---- .../serializer/util/GooglePlusActivityUtil.java | 4 ++- .../processor/GooglePlusActivitySerDeIT.java | 4 +-- 4 files changed, 27 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ee1d3c09/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/serializer/util/GPlusActivityDeserializer.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/serializer/util/GPlusActivityDeserializer.java b/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/serializer/util/GPlusActivityDeserializer.java index 988e138..7ff1d1e 100644 --- a/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/serializer/util/GPlusActivityDeserializer.java +++ b/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/serializer/util/GPlusActivityDeserializer.java @@ -142,20 +142,21 @@ public class GPlusActivityDeserializer extends JsonDeserializer<Activity> { */ private List<Activity.PlusObject.Attachments> buildAttachments(JsonNode objectNode) { List<Activity.PlusObject.Attachments> attachments = Lists.newArrayList(); - for (JsonNode attachmentNode : objectNode.get("attachments")) { - Activity.PlusObject.Attachments attachments1 = new Activity.PlusObject.Attachments(); - attachments1.setObjectType(attachmentNode.get("objectType").asText()); - attachments1.setDisplayName(attachmentNode.get("displayName").asText()); - attachments1.setContent(attachmentNode.get("content").asText()); - attachments1.setUrl(attachmentNode.get("url").asText()); - - Activity.PlusObject.Attachments.Image image1 = new Activity.PlusObject.Attachments.Image(); - JsonNode imageNode1 = attachmentNode.get("image"); - image1.setUrl(imageNode1.get("url").asText()); - attachments1.setImage(image1); - - attachments.add(attachments1); - } + if( objectNode.has("attachments") ) + for (JsonNode attachmentNode : objectNode.get("attachments")) { + Activity.PlusObject.Attachments attachments1 = new Activity.PlusObject.Attachments(); + attachments1.setObjectType(attachmentNode.get("objectType").asText()); + if( attachmentNode.has("displayName")) attachments1.setDisplayName(attachmentNode.get("displayName").asText()); + if( attachmentNode.has("content")) attachments1.setContent(attachmentNode.get("content").asText()); + if( attachmentNode.has("url")) attachments1.setUrl(attachmentNode.get("url").asText()); + + Activity.PlusObject.Attachments.Image image1 = new Activity.PlusObject.Attachments.Image(); + JsonNode imageNode1 = attachmentNode.get("image"); + image1.setUrl(imageNode1.get("url").asText()); + attachments1.setImage(image1); + + attachments.add(attachments1); + } return attachments; } http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ee1d3c09/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 179f148..e562d4f 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 @@ -91,13 +91,15 @@ public class GPlusPersonDeserializer extends JsonDeserializer<Person> { person.setVerified(node.get("verified").asBoolean()); List<Person.Emails> emails = Lists.newArrayList(); - for (JsonNode emailNode : node.get("emails")) { - Person.Emails email = m.readValue(m.writeValueAsString(emailNode), Person.Emails.class); - emails.add(email); + if( node.has("emails")) { + for (JsonNode emailNode : node.get("emails")) { + Person.Emails email = m.readValue(m.writeValueAsString(emailNode), Person.Emails.class); + emails.add(email); + } } - person.setTagline(node.get("tagline").asText()); - person.setAboutMe(node.get("aboutMe").asText()); + if( node.has("tagline")) person.setTagline(node.get("tagline").asText()); + if( node.has("aboutMe")) person.setAboutMe(node.get("aboutMe").asText()); } catch (Exception e) { LOGGER.error("Exception while trying to deserialize a Person object: {}", e); } http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ee1d3c09/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/serializer/util/GooglePlusActivityUtil.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/serializer/util/GooglePlusActivityUtil.java b/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/serializer/util/GooglePlusActivityUtil.java index 7f2a134..fb16180 100644 --- a/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/serializer/util/GooglePlusActivityUtil.java +++ b/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/serializer/util/GooglePlusActivityUtil.java @@ -149,10 +149,12 @@ public class GooglePlusActivityUtil { * @param gPlusActivity */ private static void addGPlusExtensions(Activity activity, com.google.api.services.plus.model.Activity gPlusActivity) { + + activity.getAdditionalProperties().put("googlePlus", gPlusActivity); + Map<String, Object> extensions = ExtensionUtil.getInstance().ensureExtensions(activity); com.google.api.services.plus.model.Activity.PlusObject object = gPlusActivity.getObject(); - extensions.put("googlePlus", gPlusActivity); if(object != null) { com.google.api.services.plus.model.Activity.PlusObject.Plusoners plusoners = object.getPlusoners(); http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ee1d3c09/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/processor/GooglePlusActivitySerDeIT.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/processor/GooglePlusActivitySerDeIT.java b/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/processor/GooglePlusActivitySerDeIT.java index bc6c33a..7edce7d 100644 --- a/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/processor/GooglePlusActivitySerDeIT.java +++ b/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/processor/GooglePlusActivitySerDeIT.java @@ -25,6 +25,7 @@ import com.google.gplus.serializer.util.GPlusActivityDeserializer; import com.google.gplus.serializer.util.GooglePlusActivityUtil; import org.apache.commons.lang.StringUtils; import org.apache.streams.jackson.StreamsJacksonMapper; +import org.apache.streams.pojo.extensions.ExtensionUtil; import org.apache.streams.pojo.json.Activity; import org.apache.streams.pojo.json.Actor; import org.apache.streams.pojo.json.Provider; @@ -96,9 +97,8 @@ public class GooglePlusActivitySerDeIT { assertNotNull(activity.getTitle()); assertNotNull(activity.getUrl()); - Map<String, Object> extensions = (Map<String, Object>)activity.getAdditionalProperties().get("extensions"); + Map<String, Object> extensions = ExtensionUtil.getInstance().getExtensions(activity); assertNotNull(extensions); - assertNotNull(extensions.get("googlePlus")); if(activity.getContent() != null) { assertNotNull(extensions.get("rebroadcasts"));
