Repository: beam Updated Branches: refs/heads/master 9b6b9060b -> 57f449c4c
Fix coder inference ambiguity in CombineFnsTest. String.class was being encoded with both StringUtf8Coder.of() and NullableCoder.of(UserStringCoder.of()) in the same transform, and the wrong one was being chosen. Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/3e6b02a6 Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/3e6b02a6 Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/3e6b02a6 Branch: refs/heads/master Commit: 3e6b02a6649a0bc93ee8086eea07033dbb58492e Parents: 289d2de Author: Robert Bradshaw <rober...@gmail.com> Authored: Wed May 3 12:09:24 2017 -0700 Committer: Robert Bradshaw <rober...@gmail.com> Committed: Wed May 3 14:36:03 2017 -0700 ---------------------------------------------------------------------- .../test/java/org/apache/beam/sdk/transforms/CombineFnsTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/3e6b02a6/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/CombineFnsTest.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/CombineFnsTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/CombineFnsTest.java index dcb8fdc..9250dfa 100644 --- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/CombineFnsTest.java +++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/CombineFnsTest.java @@ -231,7 +231,7 @@ public class CombineFnsTest { KV.of("b", KV.of(13, UserString.of("13")))), Arrays.asList(0L, 4L, 7L, 10L, 16L)) .withCoder(KvCoder.of( - StringUtf8Coder.of(), + NullableCoder.of(StringUtf8Coder.of()), KvCoder.of( BigEndianIntegerCoder.of(), NullableCoder.of(UserStringCoder.of())))));
