You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by sb...@apache.org on 2014/03/22 00:20:20 UTC
[42/71] [abbrv] git commit: altering StreamsResultSet to be easier to
use
altering StreamsResultSet to be easier to use
git-svn-id: https://svn.apache.org/repos/asf/incubator/streams/branches/STREAMS-26@1572231 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/396eb4a3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/396eb4a3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/396eb4a3
Branch: refs/heads/master
Commit: 396eb4a3c30a7c33f108ff79457d9992f4c68ceb
Parents: 4705fcb
Author: sblackmon <sb...@unknown>
Authored: Wed Feb 26 20:20:20 2014 +0000
Committer: sblackmon <sb...@unknown>
Committed: Wed Feb 26 20:20:20 2014 +0000
----------------------------------------------------------------------
.../provider/TwitterTimelineProvider.java | 18 +++++------
.../apache/streams/core/StreamsResultSet.java | 32 +++++++-------------
.../org/apache/streams/pojo/json/activity.json | 1 +
.../org/apache/streams/pojo/json/object.json | 1 +
4 files changed, 22 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/396eb4a3/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterTimelineProvider.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterTimelineProvider.java b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterTimelineProvider.java
index 052a360..4ef6672 100644
--- a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterTimelineProvider.java
+++ b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterTimelineProvider.java
@@ -25,10 +25,7 @@ import twitter4j.json.DataObjectFactory;
import java.io.Serializable;
import java.math.BigInteger;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Queue;
-import java.util.Random;
+import java.util.*;
import java.util.concurrent.*;
/**
@@ -183,7 +180,7 @@ public class TwitterTimelineProvider implements StreamsProvider, Serializable {
Preconditions.checkArgument(ids.hasNext());
- LOGGER.info("{} readCurrent", STREAMS_ID);
+ LOGGER.info("readCurrent");
while( ids.hasNext() ) {
Long currentId = ids.next();
@@ -191,11 +188,14 @@ public class TwitterTimelineProvider implements StreamsProvider, Serializable {
captureTimeline(currentId);
}
- LOGGER.info("{} Finished. Cleaning up...", STREAMS_ID);
+ LOGGER.info("Finished. Cleaning up...");
+
+ LOGGER.info("Providing {} docs", providerQueue.size());
+
+ StreamsResultSet result = new StreamsResultSet(providerQueue);
+
+ LOGGER.info("Exiting");
- StreamsResultSet result = (StreamsResultSet) ImmutableList.copyOf(Iterators.consumingIterator(providerQueue.iterator()));
- LOGGER.info("{} providing {} docs", STREAMS_ID, providerQueue.size());
- LOGGER.info("{} Exiting", STREAMS_ID);
return result;
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/396eb4a3/streams-core/src/main/java/org/apache/streams/core/StreamsResultSet.java
----------------------------------------------------------------------
diff --git a/streams-core/src/main/java/org/apache/streams/core/StreamsResultSet.java b/streams-core/src/main/java/org/apache/streams/core/StreamsResultSet.java
index 02bd368..d86ce6b 100644
--- a/streams-core/src/main/java/org/apache/streams/core/StreamsResultSet.java
+++ b/streams-core/src/main/java/org/apache/streams/core/StreamsResultSet.java
@@ -19,29 +19,19 @@
package org.apache.streams.core;
import java.math.BigInteger;
+import java.util.Iterator;
+import java.util.Queue;
-public interface StreamsResultSet extends Iterable<StreamsDatum> {
- /**
- * Get the time that the result set started collecting
- * @return long representing time since epoch
- */
- long getStartTime();
+public class StreamsResultSet implements Iterable<StreamsDatum> {
- /**
- * Get the time that the result set stopped collecting
- * @return long representing time since epoch
- */
- long getEndTime();
+ Queue<StreamsDatum> queue;
- /**
- * Get the source Unique identifier
- * @return String id
- */
- String getSourceId();
+ public StreamsResultSet(Queue<StreamsDatum> queue) {
+ this.queue = queue;
+ }
- /**
- * Get the maximum id of the items in the result set
- * @return the max sequence ID
- */
- BigInteger getMaxSequence();
+ @Override
+ public Iterator<StreamsDatum> iterator() {
+ return queue.iterator();
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/396eb4a3/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/activity.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/activity.json b/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/activity.json
index d5e2d27..2cdd233 100644
--- a/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/activity.json
+++ b/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/activity.json
@@ -2,6 +2,7 @@
"type" : "object",
"title" : "activity",
"javaType": "org.apache.streams.pojo.json.Activity",
+ "javaInterfaces": ["java.io.Serializable"],
"description" : "An activity construct recounts what an actor did to an object in the past. If there is no actor it simply describes the change.",
"additionalProperties": true,
"properties": {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/396eb4a3/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/object.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/object.json b/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/object.json
index 349ca71..d51db27 100644
--- a/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/object.json
+++ b/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/object.json
@@ -2,6 +2,7 @@
"type" : "object",
"title" : "object",
"javaType": "org.apache.streams.pojo.json.ActivityObject",
+ "javaInterfaces": ["java.io.Serializable"],
"description" : "Basic object on the web. The only required property is the id",
"properties" : {
"id" : {