Fix shaded imports in Flink Runner
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/27259599 Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/27259599 Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/27259599 Branch: refs/heads/master Commit: 2725959996d131b6d189f7f62df3d05e0d361ba0 Parents: 31d09eb Author: Aljoscha Krettek <aljoscha.kret...@gmail.com> Authored: Mon Sep 5 10:50:14 2016 +0200 Committer: Aljoscha Krettek <aljoscha.kret...@gmail.com> Committed: Thu Sep 8 10:12:06 2016 +0200 ---------------------------------------------------------------------- .../flink/translation/wrappers/streaming/DoFnOperator.java | 2 +- .../beam/runners/flink/streaming/DoFnOperatorTest.java | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/27259599/runners/flink/runner/src/main/java/org/apache/beam/runners/flink/translation/wrappers/streaming/DoFnOperator.java ---------------------------------------------------------------------- diff --git a/runners/flink/runner/src/main/java/org/apache/beam/runners/flink/translation/wrappers/streaming/DoFnOperator.java b/runners/flink/runner/src/main/java/org/apache/beam/runners/flink/translation/wrappers/streaming/DoFnOperator.java index 79aab9c..ee23ae4 100644 --- a/runners/flink/runner/src/main/java/org/apache/beam/runners/flink/translation/wrappers/streaming/DoFnOperator.java +++ b/runners/flink/runner/src/main/java/org/apache/beam/runners/flink/translation/wrappers/streaming/DoFnOperator.java @@ -17,7 +17,7 @@ */ package org.apache.beam.runners.flink.translation.wrappers.streaming; -import avro.shaded.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import com.google.common.collect.Iterables; import java.io.IOException; import java.io.Serializable; http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/27259599/runners/flink/runner/src/test/java/org/apache/beam/runners/flink/streaming/DoFnOperatorTest.java ---------------------------------------------------------------------- diff --git a/runners/flink/runner/src/test/java/org/apache/beam/runners/flink/streaming/DoFnOperatorTest.java b/runners/flink/runner/src/test/java/org/apache/beam/runners/flink/streaming/DoFnOperatorTest.java index 5f1b066..913fb8b 100644 --- a/runners/flink/runner/src/test/java/org/apache/beam/runners/flink/streaming/DoFnOperatorTest.java +++ b/runners/flink/runner/src/test/java/org/apache/beam/runners/flink/streaming/DoFnOperatorTest.java @@ -20,7 +20,12 @@ package org.apache.beam.runners.flink.streaming; import static org.hamcrest.collection.IsIterableContainingInOrder.contains; import static org.junit.Assert.assertThat; +import com.google.common.base.Function; +import com.google.common.base.Predicate; +import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; + import java.util.Collections; import java.util.HashMap; import javax.annotation.Nullable; @@ -40,10 +45,6 @@ import org.apache.beam.sdk.util.WindowedValue; import org.apache.beam.sdk.util.WindowingStrategy; import org.apache.beam.sdk.values.PCollectionView; import org.apache.beam.sdk.values.TupleTag; -import org.apache.flink.shaded.com.google.common.base.Function; -import org.apache.flink.shaded.com.google.common.base.Predicate; -import org.apache.flink.shaded.com.google.common.collect.FluentIterable; -import org.apache.flink.shaded.com.google.common.collect.ImmutableMap; import org.apache.flink.streaming.runtime.streamrecord.StreamRecord; import org.apache.flink.streaming.util.OneInputStreamOperatorTestHarness; import org.apache.flink.streaming.util.TwoInputStreamOperatorTestHarness;