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 2016/10/19 20:35:59 UTC
[2/6] incubator-streams git commit: integration tests work
integration tests work
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/3f80b0c1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/3f80b0c1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/3f80b0c1
Branch: refs/heads/master
Commit: 3f80b0c1948046d295910bc3c1368e839e097b7d
Parents: b7ee7d4
Author: Steve Blackmon @steveblackmon <sb...@apache.org>
Authored: Fri Oct 14 15:32:24 2016 -0500
Committer: Steve Blackmon @steveblackmon <sb...@apache.org>
Committed: Fri Oct 14 15:32:24 2016 -0500
----------------------------------------------------------------------
.../com/google/gplus/provider/GPlusUserActivityCollector.java | 3 ++-
.../java/com/google/gplus/provider/GPlusUserActivityProvider.java | 1 -
.../java/com/google/gplus/provider/GPlusUserDataCollector.java | 3 ++-
.../java/com/google/gplus/provider/GPlusUserDataProvider.java | 1 -
.../streams/gplus/test/providers/GPlusUserDataProviderIT.java | 2 +-
.../src/test/resources/GPlusUserActivityProviderIT.conf | 2 +-
.../google-gplus/src/test/resources/GPlusUserDataProviderIT.conf | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/3f80b0c1/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/GPlusUserActivityCollector.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/GPlusUserActivityCollector.java b/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/GPlusUserActivityCollector.java
index d76e225..bf8d20f 100644
--- a/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/GPlusUserActivityCollector.java
+++ b/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/GPlusUserActivityCollector.java
@@ -111,7 +111,8 @@ public class GPlusUserActivityCollector extends GPlusDataCollector {
|| (beforeDate == null && afterDate.isBefore(published))
|| (afterDate == null && beforeDate.isAfter(published))
|| ((afterDate != null && beforeDate != null) && (afterDate.isBefore(published) && beforeDate.isAfter(published)))) {
- this.datumQueue.put(new StreamsDatum(MAPPER.writeValueAsString(activity), activity.getId()));
+ String json = MAPPER.writeValueAsString(activity);
+ this.datumQueue.put(new StreamsDatum(json, activity.getId()));
} else if(afterDate != null && afterDate.isAfter(published)) {
feed.setNextPageToken(null); // do not fetch next page
break;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/3f80b0c1/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/GPlusUserActivityProvider.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/GPlusUserActivityProvider.java b/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/GPlusUserActivityProvider.java
index c890cc1..172c649 100644
--- a/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/GPlusUserActivityProvider.java
+++ b/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/GPlusUserActivityProvider.java
@@ -99,7 +99,6 @@ public class GPlusUserActivityProvider extends AbstractGPlusProvider{
json = (String) datum.getDocument();
else
json = gson.toJson(datum.getDocument());
- json = gson.toJson(datum.getDocument());
outStream.println(json);
}
} while( provider.isRunning());
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/3f80b0c1/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/GPlusUserDataCollector.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/GPlusUserDataCollector.java b/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/GPlusUserDataCollector.java
index 90efd99..78a1649 100644
--- a/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/GPlusUserDataCollector.java
+++ b/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/GPlusUserDataCollector.java
@@ -78,7 +78,8 @@ public class GPlusUserDataCollector extends GPlusDataCollector {
}
++attempts;
} while(tryAgain && attempts < MAX_ATTEMPTS);
- this.datumQueue.put(new StreamsDatum(MAPPER.writeValueAsString(person), person.getId()));
+ String json = MAPPER.writeValueAsString(person);
+ this.datumQueue.put(new StreamsDatum(json, person.getId()));
} catch (Throwable t) {
LOGGER.warn("Unable to pull user data for user={} : {}", userInfo.getUserId(), t);
if(t instanceof InterruptedException) {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/3f80b0c1/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/GPlusUserDataProvider.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/GPlusUserDataProvider.java b/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/GPlusUserDataProvider.java
index e264318..d31d764 100644
--- a/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/GPlusUserDataProvider.java
+++ b/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/GPlusUserDataProvider.java
@@ -103,7 +103,6 @@ public class GPlusUserDataProvider extends AbstractGPlusProvider{
json = (String) datum.getDocument();
else
json = gson.toJson(datum.getDocument());
- json = gson.toJson(datum.getDocument());
outStream.println(json);
}
} while( provider.isRunning());
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/3f80b0c1/streams-contrib/streams-provider-google/google-gplus/src/test/java/org/apache/streams/gplus/test/providers/GPlusUserDataProviderIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-google/google-gplus/src/test/java/org/apache/streams/gplus/test/providers/GPlusUserDataProviderIT.java b/streams-contrib/streams-provider-google/google-gplus/src/test/java/org/apache/streams/gplus/test/providers/GPlusUserDataProviderIT.java
index 574dcc1..f4b7a66 100644
--- a/streams-contrib/streams-provider-google/google-gplus/src/test/java/org/apache/streams/gplus/test/providers/GPlusUserDataProviderIT.java
+++ b/streams-contrib/streams-provider-google/google-gplus/src/test/java/org/apache/streams/gplus/test/providers/GPlusUserDataProviderIT.java
@@ -46,7 +46,7 @@ public class GPlusUserDataProviderIT {
while(outCounter.readLine() != null) {}
- assert (outCounter.getLineNumber() > 1);
+ assert (outCounter.getLineNumber() >= 1);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/3f80b0c1/streams-contrib/streams-provider-google/google-gplus/src/test/resources/GPlusUserActivityProviderIT.conf
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-google/google-gplus/src/test/resources/GPlusUserActivityProviderIT.conf b/streams-contrib/streams-provider-google/google-gplus/src/test/resources/GPlusUserActivityProviderIT.conf
index 6c8ecc1..0dbd065 100644
--- a/streams-contrib/streams-provider-google/google-gplus/src/test/resources/GPlusUserActivityProviderIT.conf
+++ b/streams-contrib/streams-provider-google/google-gplus/src/test/resources/GPlusUserActivityProviderIT.conf
@@ -14,7 +14,7 @@
# specific language governing permissions and limitations
# under the License.
gplus {
- gplusUsers = [
+ googlePlusUsers = [
{
userId = "+apache"
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/3f80b0c1/streams-contrib/streams-provider-google/google-gplus/src/test/resources/GPlusUserDataProviderIT.conf
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-google/google-gplus/src/test/resources/GPlusUserDataProviderIT.conf b/streams-contrib/streams-provider-google/google-gplus/src/test/resources/GPlusUserDataProviderIT.conf
index 6c8ecc1..0dbd065 100644
--- a/streams-contrib/streams-provider-google/google-gplus/src/test/resources/GPlusUserDataProviderIT.conf
+++ b/streams-contrib/streams-provider-google/google-gplus/src/test/resources/GPlusUserDataProviderIT.conf
@@ -14,7 +14,7 @@
# specific language governing permissions and limitations
# under the License.
gplus {
- gplusUsers = [
+ googlePlusUsers = [
{
userId = "+apache"
}