removed all occurrences of: import org.apache.streams.pojo.json.* and explicitly resolved the correct class.
this should resolve jenkins failures from misresolved classes in compile phase after STREAMS-285 merged Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/45dc963a Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/45dc963a Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/45dc963a Branch: refs/heads/asf-master Commit: 45dc963a5219f76e7b1fcc79cdb877a0e726a782 Parents: 4057bb4 Author: sblackmon <sblack...@apache.org> Authored: Fri Feb 20 16:29:50 2015 -0600 Committer: sblackmon <sblack...@apache.org> Committed: Fri Feb 20 16:29:50 2015 -0600 ---------------------------------------------------------------------- .../serializer/DatasiftInteractionActivitySerializer.java | 8 +++++++- .../streams/facebook/api/FacebookPageActivitySerializer.java | 2 +- .../streams/facebook/api/FacebookPostActivitySerializer.java | 2 +- .../streams/facebook/serializer/FacebookActivityUtil.java | 6 +++++- .../gmail/provider/GMailMessageActivitySerializer.java | 7 ++++++- .../google/gplus/serializer/util/GooglePlusActivityUtil.java | 5 ++++- .../streams/rss/serializer/SyndEntryActivitySerializer.java | 6 +++++- .../java/com/youtube/serializer/YoutubeActivityUtil.java | 6 +++++- .../streams/monitoring/tasks/BroadcastMonitorThread.java | 6 +++++- .../apache/streams/jackson/MemoryUsageDeserializerTest.java | 2 +- 10 files changed, 40 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/45dc963a/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftInteractionActivitySerializer.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftInteractionActivitySerializer.java b/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftInteractionActivitySerializer.java index 00db30d..b506820 100644 --- a/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftInteractionActivitySerializer.java +++ b/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftInteractionActivitySerializer.java @@ -28,7 +28,13 @@ import org.apache.streams.datasift.interaction.Interaction; import org.apache.streams.datasift.links.Links; import org.apache.streams.datasift.util.StreamsDatasiftMapper; import org.apache.streams.pojo.extensions.ExtensionUtil; -import org.apache.streams.pojo.json.*; +import org.apache.streams.pojo.json.Activity; +import org.apache.streams.pojo.json.ActivityObject; +import org.apache.streams.pojo.json.Actor; +import org.apache.streams.pojo.json.Generator; +import org.apache.streams.pojo.json.Icon; +import org.apache.streams.pojo.json.Image; +import org.apache.streams.pojo.json.Provider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/45dc963a/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/api/FacebookPageActivitySerializer.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/api/FacebookPageActivitySerializer.java b/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/api/FacebookPageActivitySerializer.java index f59ab1e..7a6648a 100644 --- a/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/api/FacebookPageActivitySerializer.java +++ b/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/api/FacebookPageActivitySerializer.java @@ -24,8 +24,8 @@ import org.apache.streams.data.ActivitySerializer; import org.apache.streams.exceptions.ActivitySerializerException; import org.apache.streams.facebook.serializer.FacebookActivityUtil; import org.apache.streams.jackson.StreamsJacksonMapper; -import org.apache.streams.pojo.json.*; import org.apache.streams.facebook.Page; +import org.apache.streams.pojo.json.Activity; import java.util.List; http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/45dc963a/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/api/FacebookPostActivitySerializer.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/api/FacebookPostActivitySerializer.java b/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/api/FacebookPostActivitySerializer.java index 2bc0867..4326fb1 100644 --- a/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/api/FacebookPostActivitySerializer.java +++ b/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/api/FacebookPostActivitySerializer.java @@ -24,7 +24,7 @@ import org.apache.streams.exceptions.ActivitySerializerException; import org.apache.streams.facebook.Post; import org.apache.streams.facebook.serializer.FacebookActivityUtil; import org.apache.streams.jackson.StreamsJacksonMapper; -import org.apache.streams.pojo.json.*; +import org.apache.streams.pojo.json.Activity; import org.joda.time.format.DateTimeFormat; import org.joda.time.format.DateTimeFormatter; import org.joda.time.format.ISODateTimeFormat; http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/45dc963a/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/serializer/FacebookActivityUtil.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/serializer/FacebookActivityUtil.java b/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/serializer/FacebookActivityUtil.java index fde97e4..8821006 100644 --- a/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/serializer/FacebookActivityUtil.java +++ b/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/serializer/FacebookActivityUtil.java @@ -34,7 +34,11 @@ import org.apache.streams.facebook.Post; import org.apache.streams.facebook.To; import org.apache.streams.jackson.StreamsJacksonMapper; import org.apache.streams.pojo.extensions.ExtensionUtil; -import org.apache.streams.pojo.json.*; +import org.apache.streams.pojo.json.Activity; +import org.apache.streams.pojo.json.ActivityObject; +import org.apache.streams.pojo.json.Actor; +import org.apache.streams.pojo.json.Image; +import org.apache.streams.pojo.json.Provider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/45dc963a/streams-contrib/streams-provider-google/google-gmail/src/main/java/com/google/gmail/provider/GMailMessageActivitySerializer.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-google/google-gmail/src/main/java/com/google/gmail/provider/GMailMessageActivitySerializer.java b/streams-contrib/streams-provider-google/google-gmail/src/main/java/com/google/gmail/provider/GMailMessageActivitySerializer.java index 0222ef2..3eaac41 100644 --- a/streams-contrib/streams-provider-google/google-gmail/src/main/java/com/google/gmail/provider/GMailMessageActivitySerializer.java +++ b/streams-contrib/streams-provider-google/google-gmail/src/main/java/com/google/gmail/provider/GMailMessageActivitySerializer.java @@ -36,7 +36,12 @@ import com.sun.mail.imap.IMAPSSLStore; import org.apache.commons.lang.NotImplementedException; import org.apache.streams.data.ActivitySerializer; import org.apache.streams.pojo.extensions.ExtensionUtil; -import org.apache.streams.pojo.json.*; +import org.apache.streams.pojo.json.Activity; +import org.apache.streams.pojo.json.ActivityObject; +import org.apache.streams.pojo.json.Actor; +import org.apache.streams.pojo.json.Generator; +import org.apache.streams.pojo.json.Icon; +import org.apache.streams.pojo.json.Provider; import org.joda.time.DateTime; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/45dc963a/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 ecdf67b..c8ef01e 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 @@ -23,8 +23,11 @@ import com.google.api.client.util.Maps; import com.google.api.services.plus.model.Comment; import com.google.api.services.plus.model.Person; import org.apache.streams.pojo.extensions.ExtensionUtil; -import org.apache.streams.pojo.json.*; import org.apache.streams.pojo.json.Activity; +import org.apache.streams.pojo.json.ActivityObject; +import org.apache.streams.pojo.json.Actor; +import org.apache.streams.pojo.json.Image; +import org.apache.streams.pojo.json.Provider; import org.joda.time.DateTime; import com.google.common.base.Joiner; import com.google.common.base.Optional; http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/45dc963a/streams-contrib/streams-provider-rss/src/main/java/org/apache/streams/rss/serializer/SyndEntryActivitySerializer.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-rss/src/main/java/org/apache/streams/rss/serializer/SyndEntryActivitySerializer.java b/streams-contrib/streams-provider-rss/src/main/java/org/apache/streams/rss/serializer/SyndEntryActivitySerializer.java index a993830..efbff46 100644 --- a/streams-contrib/streams-provider-rss/src/main/java/org/apache/streams/rss/serializer/SyndEntryActivitySerializer.java +++ b/streams-contrib/streams-provider-rss/src/main/java/org/apache/streams/rss/serializer/SyndEntryActivitySerializer.java @@ -27,7 +27,11 @@ import com.google.common.collect.Lists; import org.apache.streams.data.ActivitySerializer; import org.apache.streams.data.util.RFC3339Utils; import org.apache.streams.jackson.StreamsJacksonMapper; -import org.apache.streams.pojo.json.*; +import org.apache.streams.pojo.json.Activity; +import org.apache.streams.pojo.json.ActivityObject; +import org.apache.streams.pojo.json.Actor; +import org.apache.streams.pojo.json.Author; +import org.apache.streams.pojo.json.Provider; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/45dc963a/streams-contrib/streams-provider-youtube/src/main/java/com/youtube/serializer/YoutubeActivityUtil.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-youtube/src/main/java/com/youtube/serializer/YoutubeActivityUtil.java b/streams-contrib/streams-provider-youtube/src/main/java/com/youtube/serializer/YoutubeActivityUtil.java index bd10db7..619cd9f 100644 --- a/streams-contrib/streams-provider-youtube/src/main/java/com/youtube/serializer/YoutubeActivityUtil.java +++ b/streams-contrib/streams-provider-youtube/src/main/java/com/youtube/serializer/YoutubeActivityUtil.java @@ -27,7 +27,11 @@ import com.google.common.base.Optional; import com.google.common.collect.Lists; import org.apache.streams.exceptions.ActivitySerializerException; import org.apache.streams.pojo.extensions.ExtensionUtil; -import org.apache.streams.pojo.json.*; +import org.apache.streams.pojo.json.Activity; +import org.apache.streams.pojo.json.ActivityObject; +import org.apache.streams.pojo.json.Actor; +import org.apache.streams.pojo.json.Image; +import org.apache.streams.pojo.json.Provider; import org.joda.time.DateTime; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/45dc963a/streams-monitoring/src/main/java/org/apache/streams/monitoring/tasks/BroadcastMonitorThread.java ---------------------------------------------------------------------- diff --git a/streams-monitoring/src/main/java/org/apache/streams/monitoring/tasks/BroadcastMonitorThread.java b/streams-monitoring/src/main/java/org/apache/streams/monitoring/tasks/BroadcastMonitorThread.java index 59f779f..a8336aa 100644 --- a/streams-monitoring/src/main/java/org/apache/streams/monitoring/tasks/BroadcastMonitorThread.java +++ b/streams-monitoring/src/main/java/org/apache/streams/monitoring/tasks/BroadcastMonitorThread.java @@ -26,7 +26,11 @@ import org.apache.streams.monitoring.persist.MessagePersister; import org.apache.streams.monitoring.persist.impl.BroadcastMessagePersister; import org.apache.streams.monitoring.persist.impl.LogstashUdpMessagePersister; import org.apache.streams.monitoring.persist.impl.SLF4JMessagePersister; -import org.apache.streams.pojo.json.*; +import org.apache.streams.pojo.json.Broadcast; +import org.apache.streams.pojo.json.DatumStatusCounterBroadcast; +import org.apache.streams.pojo.json.MemoryUsageBroadcast; +import org.apache.streams.pojo.json.StreamsTaskCounterBroadcast; +import org.apache.streams.pojo.json.ThroughputQueueBroadcast; import org.slf4j.Logger; import javax.management.*; http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/45dc963a/streams-monitoring/src/test/java/org/apache/streams/jackson/MemoryUsageDeserializerTest.java ---------------------------------------------------------------------- diff --git a/streams-monitoring/src/test/java/org/apache/streams/jackson/MemoryUsageDeserializerTest.java b/streams-monitoring/src/test/java/org/apache/streams/jackson/MemoryUsageDeserializerTest.java index 5fdad16..fc0d6ea 100644 --- a/streams-monitoring/src/test/java/org/apache/streams/jackson/MemoryUsageDeserializerTest.java +++ b/streams-monitoring/src/test/java/org/apache/streams/jackson/MemoryUsageDeserializerTest.java @@ -21,7 +21,7 @@ import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.module.SimpleModule; import org.apache.commons.lang.StringUtils; -import org.apache.streams.pojo.json.*; +import org.apache.streams.pojo.json.MemoryUsageBroadcast; import org.junit.Before; import org.junit.Test; import org.slf4j.Logger;
