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/12/01 17:30:19 UTC
[1/2] incubator-streams git commit: accurate README.md added javadoc
header to all classes missing
Repository: incubator-streams
Updated Branches:
refs/heads/master e67948030 -> 88fcbd8d2
accurate README.md
added javadoc header to all classes missing
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/40dabfcc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/40dabfcc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/40dabfcc
Branch: refs/heads/master
Commit: 40dabfcc5e57ff64c1831c5d58c37f29e5d9cff8
Parents: 6c32ce2
Author: sblackmon <sb...@apache.org>
Authored: Fri Nov 21 17:02:39 2014 -0600
Committer: sblackmon <sb...@apache.org>
Committed: Fri Nov 21 17:02:39 2014 -0600
----------------------------------------------------------------------
.../streams/twitter/processor/TwitterEventProcessor.java | 5 ++++-
.../streams/twitter/processor/TwitterTypeConverter.java | 5 ++++-
.../apache/streams/twitter/provider/TwitterConfigurator.java | 5 ++++-
.../streams/twitter/provider/TwitterEventClassifier.java | 2 +-
.../streams/twitter/provider/TwitterStreamProvider.java | 3 ++-
.../streams/twitter/serializer/StreamsTwitterMapper.java | 4 ++--
.../streams/twitter/serializer/util/TwitterActivityUtil.java | 7 ++++---
.../streams/twitter/test/TwitterEventClassifierTest.java | 2 +-
.../streams/twitter/test/TwitterStreamProviderTest.java | 2 +-
9 files changed, 23 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/40dabfcc/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/processor/TwitterEventProcessor.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/processor/TwitterEventProcessor.java b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/processor/TwitterEventProcessor.java
index fb4615f..976a27d 100644
--- a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/processor/TwitterEventProcessor.java
+++ b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/processor/TwitterEventProcessor.java
@@ -47,8 +47,11 @@ import java.util.concurrent.BlockingQueue;
import java.util.concurrent.Callable;
/**
- * Created by sblackmon on 12/10/13.
+ * This class performs conversion of a twitter event to a specified outClass
+ *
+ * Deprecated: use TypeConverterProcessor and ActivityConverterProcessor instead
*/
+@Deprecated
public class TwitterEventProcessor implements StreamsProcessor {
private final static String STREAMS_ID = "TwitterEventProcessor";
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/40dabfcc/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/processor/TwitterTypeConverter.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/processor/TwitterTypeConverter.java b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/processor/TwitterTypeConverter.java
index 74cce27..4c52eba 100644
--- a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/processor/TwitterTypeConverter.java
+++ b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/processor/TwitterTypeConverter.java
@@ -41,8 +41,11 @@ import java.util.List;
import java.util.Queue;
/**
- * Created by sblackmon on 12/10/13.
+ * This class performs conversion of a twitter event to a specified outClass
+ *
+ * Deprecated: use TypeConverterProcessor and ActivityConverterProcessor instead
*/
+@Deprecated
public class TwitterTypeConverter implements StreamsProcessor {
public final static String STREAMS_ID = "TwitterTypeConverter";
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/40dabfcc/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterConfigurator.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterConfigurator.java b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterConfigurator.java
index 344fe43..370960b 100644
--- a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterConfigurator.java
+++ b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterConfigurator.java
@@ -32,8 +32,11 @@ import java.io.IOException;
import java.util.List;
/**
- * Created by sblackmon on 12/10/13.
+ * This class resolves TwitterConfiguration from typesafe config
+ *
+ * Deprecated: use ComponentConfigurator.detectConfig() instead
*/
+@Deprecated
public class TwitterConfigurator {
private final static Logger LOGGER = LoggerFactory.getLogger(TwitterConfigurator.class);
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/40dabfcc/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterEventClassifier.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterEventClassifier.java b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterEventClassifier.java
index 2234739..99f110a 100644
--- a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterEventClassifier.java
+++ b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterEventClassifier.java
@@ -37,7 +37,7 @@ import java.io.IOException;
import java.io.Serializable;
/**
- * Created by sblackmon on 12/13/13.
+ * TwitterEventClassifier classifies twitter events
*/
public class TwitterEventClassifier implements Serializable {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/40dabfcc/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterStreamProvider.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterStreamProvider.java b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterStreamProvider.java
index 22532d9..da5a3d0 100644
--- a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterStreamProvider.java
+++ b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterStreamProvider.java
@@ -51,7 +51,8 @@ import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
/**
- * Created by sblackmon on 12/10/13.
+ * TwitterStreamProvider wraps a hosebird client and passes recieved documents
+ * to subscribing components.
*/
public class TwitterStreamProvider implements StreamsProvider, Serializable, DatumStatusCountable {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/40dabfcc/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/StreamsTwitterMapper.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/StreamsTwitterMapper.java b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/StreamsTwitterMapper.java
index 395bd95..4b0a7da 100644
--- a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/StreamsTwitterMapper.java
+++ b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/StreamsTwitterMapper.java
@@ -39,9 +39,9 @@ import org.joda.time.format.DateTimeFormatter;
import java.io.IOException;
/**
- * Created by sblackmon on 3/27/14.
+ * This class assist with handling twitter's date-time format during conversion
*
- * Deprecated: Use StreamsJacksonMapper
+ * Deprecated: use StreamsJacksonMapper.getInstance(StreamsTwitterMapper.TWITTER_FORMAT) instead
*/
@Deprecated
public class StreamsTwitterMapper extends StreamsJacksonMapper {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/40dabfcc/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/util/TwitterActivityUtil.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/util/TwitterActivityUtil.java b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/util/TwitterActivityUtil.java
index 56b7005..c859353 100644
--- a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/util/TwitterActivityUtil.java
+++ b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/util/TwitterActivityUtil.java
@@ -26,6 +26,7 @@ import com.google.common.base.Optional;
import com.google.common.base.Strings;
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.twitter.Url;
import org.apache.streams.twitter.pojo.*;
@@ -248,7 +249,7 @@ public class TwitterActivityUtil {
* @param tweet the object to use as the source
*/
public static void addLocationExtension(Activity activity, Tweet tweet) {
- Map<String, Object> extensions = ensureExtensions(activity);
+ Map<String, Object> extensions = ExtensionUtil.ensureExtensions(activity);
Map<String, Object> location = new HashMap<String, Object>();
location.put("id", formatId(
Optional.fromNullable(
@@ -276,7 +277,7 @@ public class TwitterActivityUtil {
* @param event the Twitter event to add as the extension
*/
public static void addTwitterExtension(Activity activity, ObjectNode event) {
- Map<String, Object> extensions = org.apache.streams.data.util.ActivityUtil.ensureExtensions(activity);
+ Map<String, Object> extensions = ExtensionUtil.ensureExtensions(activity);
extensions.put("twitter", event);
}
/**
@@ -295,7 +296,7 @@ public class TwitterActivityUtil {
* @param tweet
*/
public static void addTwitterExtensions(Activity activity, Tweet tweet) {
- Map<String, Object> extensions = ensureExtensions(activity);
+ Map<String, Object> extensions = ExtensionUtil.ensureExtensions(activity);
List<String> hashtags = new ArrayList<String>();
for(Hashtag hashtag : tweet.getEntities().getHashtags()) {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/40dabfcc/streams-contrib/streams-provider-twitter/src/test/java/org/apache/streams/twitter/test/TwitterEventClassifierTest.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/src/test/java/org/apache/streams/twitter/test/TwitterEventClassifierTest.java b/streams-contrib/streams-provider-twitter/src/test/java/org/apache/streams/twitter/test/TwitterEventClassifierTest.java
index 4c7f2f3..6c1a36d 100644
--- a/streams-contrib/streams-provider-twitter/src/test/java/org/apache/streams/twitter/test/TwitterEventClassifierTest.java
+++ b/streams-contrib/streams-provider-twitter/src/test/java/org/apache/streams/twitter/test/TwitterEventClassifierTest.java
@@ -32,7 +32,7 @@ import org.junit.Assert;
import org.junit.Test;
/**
- * Created by sblackmon on 12/13/13.
+ * Tests {@link: org.apache.streams.twitter.processor.TwitterEventClassifier}
*/
public class TwitterEventClassifierTest {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/40dabfcc/streams-contrib/streams-provider-twitter/src/test/java/org/apache/streams/twitter/test/TwitterStreamProviderTest.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/src/test/java/org/apache/streams/twitter/test/TwitterStreamProviderTest.java b/streams-contrib/streams-provider-twitter/src/test/java/org/apache/streams/twitter/test/TwitterStreamProviderTest.java
index 47c5abb..b3c8651 100644
--- a/streams-contrib/streams-provider-twitter/src/test/java/org/apache/streams/twitter/test/TwitterStreamProviderTest.java
+++ b/streams-contrib/streams-provider-twitter/src/test/java/org/apache/streams/twitter/test/TwitterStreamProviderTest.java
@@ -28,7 +28,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * Created by sblackmon on 12/10/13.
+ * Tests {@link: org.apache.streams.twitter.provider.TwitterStreamProvider}
*/
public class TwitterStreamProviderTest {
[2/2] incubator-streams git commit: Merge branch 'STREAMS-39'
Posted by sb...@apache.org.
Merge branch 'STREAMS-39'
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/88fcbd8d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/88fcbd8d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/88fcbd8d
Branch: refs/heads/master
Commit: 88fcbd8d2e329c38a2f0ac4e9bc905c8e77cff2d
Parents: e679480 40dabfc
Author: sblackmon <sb...@apache.org>
Authored: Mon Dec 1 10:27:56 2014 -0600
Committer: sblackmon <sb...@apache.org>
Committed: Mon Dec 1 10:27:56 2014 -0600
----------------------------------------------------------------------
.../streams/twitter/processor/TwitterEventProcessor.java | 5 ++++-
.../streams/twitter/processor/TwitterTypeConverter.java | 5 ++++-
.../apache/streams/twitter/provider/TwitterConfigurator.java | 5 ++++-
.../streams/twitter/provider/TwitterEventClassifier.java | 2 +-
.../streams/twitter/provider/TwitterStreamProvider.java | 3 ++-
.../streams/twitter/serializer/StreamsTwitterMapper.java | 4 ++--
.../streams/twitter/serializer/util/TwitterActivityUtil.java | 7 ++++---
.../streams/twitter/test/TwitterEventClassifierTest.java | 2 +-
.../streams/twitter/test/TwitterStreamProviderTest.java | 2 +-
9 files changed, 23 insertions(+), 12 deletions(-)
----------------------------------------------------------------------