Repository: incubator-beam Updated Branches: refs/heads/master d0b9ca910 -> 402fb70c4
DisplayData: a few build fixups Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/6c10a1d7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/6c10a1d7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/6c10a1d7 Branch: refs/heads/master Commit: 6c10a1d73981ea6cac8b557f492c3682e9035d4d Parents: d0b9ca9 Author: Dan Halperin <[email protected]> Authored: Thu May 19 17:58:49 2016 -0700 Committer: Dan Halperin <[email protected]> Committed: Thu May 19 18:39:31 2016 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/beam/sdk/transforms/Combine.java | 3 ++- .../beam/sdk/transforms/display/DisplayDataEvaluatorTest.java | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/6c10a1d7/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Combine.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Combine.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Combine.java index 190c413..20c1242 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Combine.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Combine.java @@ -1785,7 +1785,8 @@ public class Combine { public PCollection<KV<K, OutputT>> apply(PCollection<KV<K, InputT>> input) { return input .apply(GroupByKey.<K, InputT>create(fewKeys)) - .apply(Combine.groupedValues(fn, fnDisplayData).withSideInputs(sideInputs)); + .apply(Combine.<K, InputT, OutputT>groupedValues(fn, fnDisplayData) + .withSideInputs(sideInputs)); } @Override http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/6c10a1d7/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/display/DisplayDataEvaluatorTest.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/display/DisplayDataEvaluatorTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/display/DisplayDataEvaluatorTest.java index 7b1dc79..318c116 100644 --- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/display/DisplayDataEvaluatorTest.java +++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/display/DisplayDataEvaluatorTest.java @@ -30,6 +30,8 @@ import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.POutput; import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import java.io.Serializable; import java.util.Set; @@ -37,6 +39,7 @@ import java.util.Set; /** * Unit tests for {@link DisplayDataEvaluator}. */ +@RunWith(JUnit4.class) public class DisplayDataEvaluatorTest implements Serializable { @Test
