accomodate STREAMS-465,466,467
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/commit/1fb1e0e1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/tree/1fb1e0e1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/diff/1fb1e0e1 Branch: refs/heads/master Commit: 1fb1e0e11afee3f76e4eb3b61dcd70884a738043 Parents: cb7c0b9 Author: Steve Blackmon @steveblackmon <sblack...@apache.org> Authored: Sat Dec 17 13:58:43 2016 -0600 Committer: Steve Blackmon @steveblackmon <sblack...@apache.org> Committed: Sat Dec 17 13:58:43 2016 -0600 ---------------------------------------------------------------------- .../src/main/jsonschema/TwitterPostsPipelineConfiguration.json | 2 +- .../flink/twitter/collection/FlinkTwitterPostsPipeline.scala | 6 +++--- .../twitter/TwitterHistoryElasticsearchConfiguration.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/1fb1e0e1/flink/flink-twitter-collection/src/main/jsonschema/TwitterPostsPipelineConfiguration.json ---------------------------------------------------------------------- diff --git a/flink/flink-twitter-collection/src/main/jsonschema/TwitterPostsPipelineConfiguration.json b/flink/flink-twitter-collection/src/main/jsonschema/TwitterPostsPipelineConfiguration.json index 628d7ee..e994ad5 100644 --- a/flink/flink-twitter-collection/src/main/jsonschema/TwitterPostsPipelineConfiguration.json +++ b/flink/flink-twitter-collection/src/main/jsonschema/TwitterPostsPipelineConfiguration.json @@ -12,7 +12,7 @@ "properties": { "twitter": { "type": "object", - "javaType": "org.apache.streams.twitter.TwitterUserInformationConfiguration" + "javaType": "org.apache.streams.twitter.TwitterTimelineProviderConfiguration" }, "source": { "type": "object", http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/1fb1e0e1/flink/flink-twitter-collection/src/main/scala/org/apache/streams/examples/flink/twitter/collection/FlinkTwitterPostsPipeline.scala ---------------------------------------------------------------------- diff --git a/flink/flink-twitter-collection/src/main/scala/org/apache/streams/examples/flink/twitter/collection/FlinkTwitterPostsPipeline.scala b/flink/flink-twitter-collection/src/main/scala/org/apache/streams/examples/flink/twitter/collection/FlinkTwitterPostsPipeline.scala index 549e048..eb7f2c1 100644 --- a/flink/flink-twitter-collection/src/main/scala/org/apache/streams/examples/flink/twitter/collection/FlinkTwitterPostsPipeline.scala +++ b/flink/flink-twitter-collection/src/main/scala/org/apache/streams/examples/flink/twitter/collection/FlinkTwitterPostsPipeline.scala @@ -36,6 +36,7 @@ import org.apache.streams.examples.flink.FlinkBase import org.apache.streams.examples.flink.twitter.TwitterPostsPipelineConfiguration import org.apache.streams.flink.FlinkStreamingConfiguration import org.apache.streams.jackson.StreamsJacksonMapper +import org.apache.streams.twitter.TwitterTimelineProviderConfiguration import org.apache.streams.twitter.pojo.Tweet import org.apache.streams.twitter.provider.TwitterTimelineProvider import org.slf4j.{Logger, LoggerFactory} @@ -152,10 +153,9 @@ class FlinkTwitterPostsPipeline(config: TwitterPostsPipelineConfiguration = new } def collectPosts(id : String, out : Collector[StreamsDatum]) = { val twitterConfiguration = config.getTwitter + twitterConfiguration.setInfo(List(toProviderId(id))) val twitProvider: TwitterTimelineProvider = - new TwitterTimelineProvider( - twitterConfiguration.withInfo(List(toProviderId(id))) - ) + new TwitterTimelineProvider(twitterConfiguration) twitProvider.prepare(twitProvider) twitProvider.startStream() var iterator: Iterator[StreamsDatum] = null http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/1fb1e0e1/local/twitter-history-elasticsearch/src/main/jsonschema/org/apache/streams/example/twitter/TwitterHistoryElasticsearchConfiguration.json ---------------------------------------------------------------------- diff --git a/local/twitter-history-elasticsearch/src/main/jsonschema/org/apache/streams/example/twitter/TwitterHistoryElasticsearchConfiguration.json b/local/twitter-history-elasticsearch/src/main/jsonschema/org/apache/streams/example/twitter/TwitterHistoryElasticsearchConfiguration.json index eaf8028..1886325 100644 --- a/local/twitter-history-elasticsearch/src/main/jsonschema/org/apache/streams/example/twitter/TwitterHistoryElasticsearchConfiguration.json +++ b/local/twitter-history-elasticsearch/src/main/jsonschema/org/apache/streams/example/twitter/TwitterHistoryElasticsearchConfiguration.json @@ -7,7 +7,7 @@ "javaType" : "org.apache.streams.example.TwitterHistoryElasticsearchConfiguration", "javaInterfaces": ["java.io.Serializable"], "properties": { - "twitter": { "javaType": "org.apache.streams.twitter.TwitterUserInformationConfiguration", "type": "object", "required": true }, + "twitter": { "javaType": "org.apache.streams.twitter.TwitterTimelineProviderConfiguration", "type": "object", "required": true }, "elasticsearch": { "javaType": "org.apache.streams.elasticsearch.ElasticsearchWriterConfiguration", "type": "object", "required": true } } }
