[beam] 01/01: Merge pull request #5181: Use Generic types in Bundle

[tgroh]

This is an automated email from the ASF dual-hosted git repository.

tgroh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git

commit cae963a810224ba6ce6c9623ee70fbaa57de9c11
Merge: 2bcc606 4adf454
Author: Thomas Groh <tg...@users.noreply.github.com>
AuthorDate: Tue Apr 24 15:59:30 2018 -0700

    Merge pull request #5181: Use Generic types in Bundle
    
    [BEAM-4153]

 .../beam/runners/direct/BundleProcessor.java       |  3 +-
 .../beam/runners/direct/CommittedBundle.java       | 16 +++--
 .../beam/runners/direct/EvaluationContext.java     |  5 +-
 .../direct/ExecutorServiceParallelExecutor.java    |  4 +-
 .../beam/runners/direct/QuiescenceDriver.java      |  9 ++-
 .../beam/runners/direct/WatermarkManager.java      | 80 +++++++++++-----------
 .../beam/runners/direct/WatermarkManagerTest.java  |  7 +-
 .../java/org/apache/beam/runners/local/Bundle.java | 27 +++++++-
 8 files changed, 93 insertions(+), 58 deletions(-)

diff --cc 
runners/direct-java/src/test/java/org/apache/beam/runners/direct/WatermarkManagerTest.java
index 5c4fdf9,d105efe..b8aef85
--- 
a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/WatermarkManagerTest.java
+++ 
b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/WatermarkManagerTest.java
@@@ -67,8 -65,10 +67,7 @@@ import org.apache.beam.sdk.util.Windowe
  import org.apache.beam.sdk.values.KV;
  import org.apache.beam.sdk.values.PCollection;
  import org.apache.beam.sdk.values.PCollectionList;
- import org.apache.beam.sdk.values.PValue;
  import org.apache.beam.sdk.values.TimestampedValue;
 -import org.hamcrest.BaseMatcher;
 -import org.hamcrest.Description;
 -import org.hamcrest.Matcher;
  import org.hamcrest.Matchers;
  import org.joda.time.Duration;
  import org.joda.time.Instant;

-- 
To stop receiving notification emails like this one, please contact
tg...@apache.org.