Repository: incubator-beam Updated Branches: refs/heads/master 5e9a80cf6 -> 33c687069
Remove overspecified type in ParDoEvaluator Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/1b7b065f Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/1b7b065f Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/1b7b065f Branch: refs/heads/master Commit: 1b7b065f4ccae7c52934b1e73fd1fbfb33c3398d Parents: 5e9a80c Author: Kenneth Knowles <k...@google.com> Authored: Mon Nov 21 11:34:45 2016 -0800 Committer: Kenneth Knowles <k...@google.com> Committed: Mon Nov 28 11:07:28 2016 -0800 ---------------------------------------------------------------------- .../java/org/apache/beam/runners/direct/ParDoEvaluator.java | 6 +++--- .../org/apache/beam/runners/direct/ParDoEvaluatorFactory.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/1b7b065f/runners/direct-java/src/main/java/org/apache/beam/runners/direct/ParDoEvaluator.java ---------------------------------------------------------------------- diff --git a/runners/direct-java/src/main/java/org/apache/beam/runners/direct/ParDoEvaluator.java b/runners/direct-java/src/main/java/org/apache/beam/runners/direct/ParDoEvaluator.java index 254fa44..3285c7e 100644 --- a/runners/direct-java/src/main/java/org/apache/beam/runners/direct/ParDoEvaluator.java +++ b/runners/direct-java/src/main/java/org/apache/beam/runners/direct/ParDoEvaluator.java @@ -45,7 +45,7 @@ class ParDoEvaluator<InputT, OutputT> implements TransformEvaluator<InputT> { public static <InputT, OutputT> ParDoEvaluator<InputT, OutputT> create( EvaluationContext evaluationContext, DirectStepContext stepContext, - AppliedPTransform<PCollection<InputT>, ?, ?> application, + AppliedPTransform<?, ?, ?> application, WindowingStrategy<?, ? extends BoundedWindow> windowingStrategy, Serializable fn, // may be OldDoFn or DoFn List<PCollectionView<?>> sideInputs, @@ -90,7 +90,7 @@ class ParDoEvaluator<InputT, OutputT> implements TransformEvaluator<InputT> { //////////////////////////////////////////////////////////////////////////////////////////////// private final PushbackSideInputDoFnRunner<InputT, ?> fnRunner; - private final AppliedPTransform<PCollection<InputT>, ?, ?> transform; + private final AppliedPTransform<?, ?, ?> transform; private final AggregatorContainer.Mutator aggregatorChanges; private final Collection<UncommittedBundle<?>> outputBundles; private final DirectStepContext stepContext; @@ -99,7 +99,7 @@ class ParDoEvaluator<InputT, OutputT> implements TransformEvaluator<InputT> { private ParDoEvaluator( PushbackSideInputDoFnRunner<InputT, ?> fnRunner, - AppliedPTransform<PCollection<InputT>, ?, ?> transform, + AppliedPTransform<?, ?, ?> transform, AggregatorContainer.Mutator aggregatorChanges, Collection<UncommittedBundle<?>> outputBundles, DirectStepContext stepContext) { http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/1b7b065f/runners/direct-java/src/main/java/org/apache/beam/runners/direct/ParDoEvaluatorFactory.java ---------------------------------------------------------------------- diff --git a/runners/direct-java/src/main/java/org/apache/beam/runners/direct/ParDoEvaluatorFactory.java b/runners/direct-java/src/main/java/org/apache/beam/runners/direct/ParDoEvaluatorFactory.java index f126000..b776da1 100644 --- a/runners/direct-java/src/main/java/org/apache/beam/runners/direct/ParDoEvaluatorFactory.java +++ b/runners/direct-java/src/main/java/org/apache/beam/runners/direct/ParDoEvaluatorFactory.java @@ -82,7 +82,7 @@ final class ParDoEvaluatorFactory<InputT, OutputT> implements TransformEvaluator try { ParDo.BoundMulti<InputT, OutputT> transform = application.getTransform(); return DoFnLifecycleManagerRemovingTransformEvaluator.wrapping( - ParDoEvaluator.create( + ParDoEvaluator.<InputT, OutputT>create( evaluationContext, stepContext, application,