Use PCollectionViews.toAdditionalInputs in Combine
Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/27674f07 Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/27674f07 Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/27674f07 Branch: refs/heads/master Commit: 27674f07cf8363bb6b3c051a990caa5d61b8cd5c Parents: ed476dd Author: Kenneth Knowles <k...@google.com> Authored: Tue Jun 27 14:44:50 2017 -0700 Committer: Kenneth Knowles <k...@google.com> Committed: Tue Jun 27 21:08:11 2017 -0700 ---------------------------------------------------------------------- .../java/org/apache/beam/sdk/transforms/Combine.java | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/27674f07/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 6a90bcf..d7effb5 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 @@ -20,7 +20,6 @@ package org.apache.beam.sdk.transforms; import static com.google.common.base.Preconditions.checkState; import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import java.io.IOException; import java.io.InputStream; @@ -1122,11 +1121,7 @@ public class Combine { */ @Override public Map<TupleTag<?>, PValue> getAdditionalInputs() { - ImmutableMap.Builder<TupleTag<?>, PValue> additionalInputs = ImmutableMap.builder(); - for (PCollectionView<?> sideInput : sideInputs) { - additionalInputs.put(sideInput.getTagInternal(), sideInput.getPCollection()); - } - return additionalInputs.build(); + return PCollectionViews.toAdditionalInputs(sideInputs); } /** @@ -1578,11 +1573,7 @@ public class Combine { */ @Override public Map<TupleTag<?>, PValue> getAdditionalInputs() { - ImmutableMap.Builder<TupleTag<?>, PValue> additionalInputs = ImmutableMap.builder(); - for (PCollectionView<?> sideInput : sideInputs) { - additionalInputs.put(sideInput.getTagInternal(), sideInput.getPCollection()); - } - return additionalInputs.build(); + return PCollectionViews.toAdditionalInputs(sideInputs); } @Override