Merge branch 'master' into STREAMS-68,218
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/8120fff4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/8120fff4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/8120fff4 Branch: refs/heads/STREAMS-212 Commit: 8120fff47982643cb09e64627c52f8b49d833f33 Parents: b5cb7eb 6c32ce2 Author: Steve Blackmon <[email protected]> Authored: Sun Nov 23 14:01:18 2014 -0600 Committer: Steve Blackmon <[email protected]> Committed: Sun Nov 23 14:01:18 2014 -0600 ---------------------------------------------------------------------- streams-config/pom.xml | 14 +- .../streams/config/ComponentConfigurator.java | 73 +++++++ .../streams/config/StreamsConfigurator.java | 41 +++- .../main/jsonschema/ComponentConfiguration.json | 23 ++ .../main/jsonschema/StreamsConfiguration.json | 7 +- .../config/test/ComponentConfiguratorTest.java | 125 +++++++++++ .../config/test/StreamsConfiguratorTest.java | 69 ++++++ .../src/test/resources/componentTest.conf | 11 + .../serializer/FacebookActivityUtil.java | 2 +- .../processor/GooglePlusTypeConverter.java | 38 ++++ .../gplus/provider/AbstractGPlusProvider.java | 31 +-- .../gplus/provider/GPlusConfigurator.java | 32 +-- .../provider/GPlusUserActivityCollector.java | 29 ++- .../provider/GPlusUserActivityProvider.java | 11 + .../gplus/provider/GPlusUserDataProvider.java | 11 + .../serializer/util/GPlusEventClassifier.java | 57 +++++ .../com/google/gplus/GPlusConfiguration.json | 17 +- .../provider/TestAbstractGPlusProvider.java | 7 +- .../util/GPlusEventClassifierTest.java | 69 ++++++ .../processor/TwitterEventProcessor.java | 194 +++++++++++++++++ .../twitter/processor/TwitterTypeConverter.java | 209 +++++++++++++++++++ .../tasks/BroadcastMonitorThread.java | 5 +- .../org/apache/streams/pojo/json/Broadcast.json | 8 + .../local/builders/LocalStreamBuilder.java | 41 +++- .../streams/local/builders/StreamComponent.java | 31 +-- .../local/counters/DatumStatusCounter.java | 9 +- .../local/counters/StreamsTaskCounter.java | 16 +- .../streams/local/queues/ThroughputQueue.java | 52 ++++- .../streams/local/tasks/BaseStreamsTask.java | 43 +++- .../streams/local/tasks/StreamsMergeTask.java | 7 +- .../local/tasks/StreamsPersistWriterTask.java | 16 +- .../local/tasks/StreamsProcessorTask.java | 21 +- .../local/tasks/StreamsProviderTask.java | 13 +- .../local/builders/LocalStreamBuilderTest.java | 9 +- .../local/counters/DatumStatusCounterTest.java | 22 +- .../local/counters/StreamsTaskCounterTest.java | 21 +- .../queues/ThroughputQueueMulitThreadTest.java | 5 +- .../queues/ThroughputQueueSingleThreadTest.java | 15 +- .../streams/local/tasks/BasicTasksTest.java | 6 +- .../local/tasks/StreamsProviderTaskTest.java | 10 +- .../streams/storm/trident/StreamsTopology.java | 2 +- 41 files changed, 1280 insertions(+), 142 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/8120fff4/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/processor/GooglePlusTypeConverter.java ----------------------------------------------------------------------
