You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by dh...@apache.org on 2016/04/26 23:42:54 UTC

[1/3] incubator-beam git commit: Fix multi-line string format

Repository: incubator-beam
Updated Branches:
  refs/heads/master aa43ec0b0 -> 8a2a1ced0


Fix multi-line string format


Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/4a138e94
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/4a138e94
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/4a138e94

Branch: refs/heads/master
Commit: 4a138e943681b3a5a63f034dcb898750fb2fc4d9
Parents: 0d6c53a
Author: Scott Wegner <sw...@google.com>
Authored: Tue Apr 26 14:07:23 2016 -0700
Committer: Dan Halperin <dh...@google.com>
Committed: Tue Apr 26 14:42:39 2016 -0700

----------------------------------------------------------------------
 .../org/apache/beam/sdk/transforms/windowing/StubTrigger.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/4a138e94/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/windowing/StubTrigger.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/windowing/StubTrigger.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/windowing/StubTrigger.java
index 738c0bc..06218cf 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/windowing/StubTrigger.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/windowing/StubTrigger.java
@@ -17,7 +17,8 @@
  */
 package org.apache.beam.sdk.transforms.windowing;
 
-import com.google.api.client.util.Lists;
+import com.google.common.collect.Lists;
+
 import org.joda.time.Instant;
 
 import java.util.List;


[2/3] incubator-beam git commit: Reference correct Lists import

Posted by dh...@apache.org.
Reference correct Lists import


Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/0d6c53ae
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/0d6c53ae
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/0d6c53ae

Branch: refs/heads/master
Commit: 0d6c53aefc6cdbdc560688b8cb6bb454a5bf61c6
Parents: aa43ec0
Author: Scott Wegner <sw...@google.com>
Authored: Tue Apr 26 14:07:10 2016 -0700
Committer: Dan Halperin <dh...@google.com>
Committed: Tue Apr 26 14:42:39 2016 -0700

----------------------------------------------------------------------
 .../sdk/transforms/windowing/AfterProcessingTimeTest.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/0d6c53ae/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/windowing/AfterProcessingTimeTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/windowing/AfterProcessingTimeTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/windowing/AfterProcessingTimeTest.java
index 8178d54..8d2b4a1 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/windowing/AfterProcessingTimeTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/windowing/AfterProcessingTimeTest.java
@@ -179,10 +179,10 @@ public class AfterProcessingTimeTest {
             .plusDelayOf(Duration.standardMinutes(10)))
         .buildTrigger();
 
-    String expected = "AfterWatermark.pastEndOfWindow()" +
-        ".withLateFirings(AfterProcessingTime" +
-          ".pastFirstElementInPane()" +
-          ".plusDelayOf(10 minutes))";
+    String expected = "AfterWatermark.pastEndOfWindow()"
+        + ".withLateFirings(AfterProcessingTime"
+        + ".pastFirstElementInPane()"
+        + ".plusDelayOf(10 minutes))";
 
     assertEquals(expected, trigger.toString());
   }


[3/3] incubator-beam git commit: Closes #244

Posted by dh...@apache.org.
Closes #244


Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/8a2a1ced
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/8a2a1ced
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/8a2a1ced

Branch: refs/heads/master
Commit: 8a2a1ced03a6ca9304f48de23d5769e72feff36c
Parents: aa43ec0 4a138e9
Author: Dan Halperin <dh...@google.com>
Authored: Tue Apr 26 14:42:40 2016 -0700
Committer: Dan Halperin <dh...@google.com>
Committed: Tue Apr 26 14:42:40 2016 -0700

----------------------------------------------------------------------
 .../sdk/transforms/windowing/AfterProcessingTimeTest.java    | 8 ++++----
 .../apache/beam/sdk/transforms/windowing/StubTrigger.java    | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------