streams-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sblack...@apache.org
Subject [2/3] incubator-streams git commit: resolves STREAMS-334 #334
Date Fri, 19 Jun 2015 21:38:26 GMT
resolves STREAMS-334 #334


Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/8538b9c2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/8538b9c2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/8538b9c2

Branch: refs/heads/master
Commit: 8538b9c27de411d0ccf74c38be9435999bbaedaf
Parents: 701165f
Author: Steve Blackmon (@steveblackmon) <sblackmon@apache.org>
Authored: Mon Jun 1 09:33:48 2015 -0500
Committer: Steve Blackmon (@steveblackmon) <sblackmon@apache.org>
Committed: Mon Jun 1 09:59:06 2015 -0500

----------------------------------------------------------------------
 streams-contrib/streams-provider-datasift/pom.xml | 18 ++++++++++--------
 .../provider/DatasiftStreamProviderTest.java      |  6 +++---
 2 files changed, 13 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/8538b9c2/streams-contrib/streams-provider-datasift/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-datasift/pom.xml b/streams-contrib/streams-provider-datasift/pom.xml
index aa1efda..d37f133 100644
--- a/streams-contrib/streams-provider-datasift/pom.xml
+++ b/streams-contrib/streams-provider-datasift/pom.xml
@@ -29,13 +29,6 @@
 
     <description>Datasift Provider</description>
 
-    <repositories>
-        <repository>
-            <id>boundary-site</id>
-            <url>http://maven.boundary.com/artifactory/repo</url>
-        </repository>
-    </repositories>
-
     <dependencies>
         <dependency>
             <groupId>com.typesafe</groupId>
@@ -73,7 +66,7 @@
         <dependency>
             <groupId>com.datasift.client</groupId>
             <artifactId>datasift-java</artifactId>
-            <version>3.0.0-Beta3.5</version>
+            <version>3.2.6</version>
             <exclusions>
                 <exclusion>
                     <artifactId>slf4j-log4j12</artifactId>
@@ -83,9 +76,18 @@
                     <artifactId>log4j</artifactId>
                     <groupId>log4j</groupId>
                 </exclusion>
+                <exclusion>
+                    <groupId>com.boundary</groupId>
+                    <artifactId>high-scale-lib</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
+            <groupId>com.boundary</groupId>
+            <artifactId>high-scale-lib</artifactId>
+            <version>1.0.6</version>
+        </dependency>
+        <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
         </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/8538b9c2/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/provider/DatasiftStreamProviderTest.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/provider/DatasiftStreamProviderTest.java
b/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/provider/DatasiftStreamProviderTest.java
index 3bcd7ef..a7d14b4 100644
--- a/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/provider/DatasiftStreamProviderTest.java
+++ b/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/provider/DatasiftStreamProviderTest.java
@@ -19,8 +19,8 @@
 package org.apache.streams.datasift.provider;
 
 import com.datasift.client.DataSiftClient;
+import com.datasift.client.stream.ConnectionManager;
 import com.datasift.client.stream.StreamEventListener;
-import com.datasift.client.stream.StreamingData;
 import com.google.common.collect.Lists;
 import org.apache.streams.datasift.DatasiftConfiguration;
 import org.junit.Test;
@@ -117,8 +117,8 @@ public class DatasiftStreamProviderTest {
             @Override
             protected DataSiftClient getNewClient(String userName, String apiKey) {
                 DataSiftClient client = Mockito.mock(DataSiftClient.class);
-                StreamingData mockData = Mockito.mock(StreamingData.class);
-                Mockito.when(client.liveStream()).thenReturn(mockData);
+                ConnectionManager mockConnection = Mockito.mock(ConnectionManager.class);
+                Mockito.when(client.liveStream()).thenReturn(mockConnection);
                 clientList.add(client);
                 return client;
             }


Mime
View raw message