http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/PipelinedSubpartition.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/PipelinedSubpartition.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/PipelinedSubpartition.java index 3b7a2a6..2d7097d 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/PipelinedSubpartition.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/PipelinedSubpartition.java @@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory; import java.util.ArrayDeque; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * A pipelined in-memory only subpartition, which can be consumed once.
http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/PipelinedSubpartitionView.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/PipelinedSubpartitionView.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/PipelinedSubpartitionView.java index 51f1eab..86c241c 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/PipelinedSubpartitionView.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/PipelinedSubpartitionView.java @@ -23,7 +23,7 @@ import org.apache.flink.runtime.util.event.NotificationListener; import java.util.concurrent.atomic.AtomicBoolean; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * View over a pipelined in-memory only subpartition. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/ResultPartition.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/ResultPartition.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/ResultPartition.java index 189ee62..0068fe0 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/ResultPartition.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/ResultPartition.java @@ -37,10 +37,10 @@ import java.io.IOException; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.base.Preconditions.checkElementIndex; -import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.common.base.Preconditions.checkState; +import static org.apache.flink.util.Preconditions.checkArgument; +import static org.apache.flink.util.Preconditions.checkElementIndex; +import static org.apache.flink.util.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkState; /** * A result partition for data produced by a single task. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/ResultPartitionManager.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/ResultPartitionManager.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/ResultPartitionManager.java index 4063c1c..9da3e14 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/ResultPartitionManager.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/ResultPartitionManager.java @@ -30,7 +30,7 @@ import org.slf4j.LoggerFactory; import java.io.IOException; import java.util.Map; -import static com.google.common.base.Preconditions.checkState; +import static org.apache.flink.util.Preconditions.checkState; /** * The result partition manager keeps track of all currently produced/consumed partitions of a http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/SpillableSubpartition.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/SpillableSubpartition.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/SpillableSubpartition.java index 21e9cc6..556f1d2 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/SpillableSubpartition.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/SpillableSubpartition.java @@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory; import java.io.IOException; import java.util.ArrayList; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * A blocking in-memory subpartition, which is able to spill to disk. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/SpillableSubpartitionView.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/SpillableSubpartitionView.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/SpillableSubpartitionView.java index c9da40a..39427cf 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/SpillableSubpartitionView.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/SpillableSubpartitionView.java @@ -26,8 +26,8 @@ import org.apache.flink.runtime.util.event.NotificationListener; import java.io.IOException; import java.util.concurrent.atomic.AtomicBoolean; -import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkArgument; +import static org.apache.flink.util.Preconditions.checkNotNull; class SpillableSubpartitionView implements ResultSubpartitionView { http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/SpilledSubpartitionViewAsyncIO.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/SpilledSubpartitionViewAsyncIO.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/SpilledSubpartitionViewAsyncIO.java index 052a7cd..d63f7d5 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/SpilledSubpartitionViewAsyncIO.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/SpilledSubpartitionViewAsyncIO.java @@ -31,8 +31,8 @@ import java.io.IOException; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.atomic.AtomicInteger; -import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkArgument; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * View over a spilled subpartition. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/SpilledSubpartitionViewSyncIO.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/SpilledSubpartitionViewSyncIO.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/SpilledSubpartitionViewSyncIO.java index 2c0c744..927d1e9 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/SpilledSubpartitionViewSyncIO.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/SpilledSubpartitionViewSyncIO.java @@ -32,8 +32,8 @@ import java.util.ArrayDeque; import java.util.Queue; import java.util.concurrent.atomic.AtomicBoolean; -import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkArgument; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * View over a spilled subpartition. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/BufferOrEvent.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/BufferOrEvent.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/BufferOrEvent.java index 55e5767..885e738 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/BufferOrEvent.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/BufferOrEvent.java @@ -21,8 +21,8 @@ package org.apache.flink.runtime.io.network.partition.consumer; import org.apache.flink.runtime.event.AbstractEvent; import org.apache.flink.runtime.io.network.buffer.Buffer; -import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkArgument; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * Either type for {@link Buffer} or {@link AbstractEvent} instances tagged with the channel index, http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/InputChannel.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/InputChannel.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/InputChannel.java index d282db5..e6e078d 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/InputChannel.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/InputChannel.java @@ -28,8 +28,8 @@ import scala.Tuple2; import java.io.IOException; import java.util.concurrent.atomic.AtomicReference; -import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkArgument; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * An input channel consumes a single {@link ResultSubpartitionView}. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/LocalInputChannel.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/LocalInputChannel.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/LocalInputChannel.java index ff12153..92b6d1f 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/LocalInputChannel.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/LocalInputChannel.java @@ -37,8 +37,8 @@ import java.io.IOException; import java.util.Timer; import java.util.TimerTask; -import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.common.base.Preconditions.checkState; +import static org.apache.flink.util.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkState; /** * An input channel, which requests a local subpartition. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/RemoteInputChannel.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/RemoteInputChannel.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/RemoteInputChannel.java index be2509f..814e961 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/RemoteInputChannel.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/RemoteInputChannel.java @@ -35,8 +35,8 @@ import java.util.ArrayDeque; import java.util.Queue; import java.util.concurrent.atomic.AtomicBoolean; -import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.common.base.Preconditions.checkState; +import static org.apache.flink.util.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkState; /** * An input channel, which requests a remote partition queue. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/SingleInputGate.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/SingleInputGate.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/SingleInputGate.java index bf8bc73..81d202a 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/SingleInputGate.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/SingleInputGate.java @@ -52,9 +52,9 @@ import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; -import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.common.base.Preconditions.checkState; +import static org.apache.flink.util.Preconditions.checkArgument; +import static org.apache.flink.util.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkState; /** * An input gate consumes one or more partitions of a single produced intermediate result. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/UnionInputGate.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/UnionInputGate.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/UnionInputGate.java index 5599687..b1b8911 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/UnionInputGate.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/UnionInputGate.java @@ -32,8 +32,8 @@ import java.util.concurrent.BlockingQueue; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.LinkedBlockingQueue; -import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkArgument; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * Input gate wrapper to union the input from multiple input gates. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/UnknownInputChannel.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/UnknownInputChannel.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/UnknownInputChannel.java index cdf28be..015f3fa 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/UnknownInputChannel.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/UnknownInputChannel.java @@ -30,7 +30,7 @@ import scala.Tuple2; import java.io.IOException; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * An input channel place holder to be replaced by either a {@link RemoteInputChannel} http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/IterationSynchronizationSinkTask.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/IterationSynchronizationSinkTask.java b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/IterationSynchronizationSinkTask.java index f1ab93f..66fb45b 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/IterationSynchronizationSinkTask.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/IterationSynchronizationSinkTask.java @@ -39,8 +39,7 @@ import org.apache.flink.runtime.iterative.event.WorkerDoneEvent; import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable; import org.apache.flink.runtime.operators.util.TaskConfig; import org.apache.flink.types.Value; - -import com.google.common.base.Preconditions; +import org.apache.flink.util.Preconditions; /** * The task responsible for synchronizing all iteration heads, implemented as an output task. This task http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/SyncEventHandler.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/SyncEventHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/SyncEventHandler.java index d7549d1..71c15b1 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/SyncEventHandler.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/SyncEventHandler.java @@ -25,8 +25,7 @@ import org.apache.flink.runtime.event.TaskEvent; import org.apache.flink.runtime.util.event.EventListener; import org.apache.flink.runtime.iterative.event.WorkerDoneEvent; import org.apache.flink.types.Value; - -import com.google.common.base.Preconditions; +import org.apache.flink.util.Preconditions; public class SyncEventHandler implements EventListener<TaskEvent> { http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/IntermediateDataSet.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/IntermediateDataSet.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/IntermediateDataSet.java index 1a14ed5..c30c78e 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/IntermediateDataSet.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/IntermediateDataSet.java @@ -23,7 +23,7 @@ import org.apache.flink.runtime.io.network.partition.ResultPartitionType; import java.util.ArrayList; import java.util.List; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * An intermediate data set is the data set produced by an operator - either a http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/JobVertex.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/JobVertex.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/JobVertex.java index acb22aa..379a42a 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/JobVertex.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/JobVertex.java @@ -29,8 +29,7 @@ import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable; import org.apache.flink.runtime.jobgraph.tasks.StoppableTask; import org.apache.flink.runtime.jobmanager.scheduler.CoLocationGroup; import org.apache.flink.runtime.jobmanager.scheduler.SlotSharingGroup; - -import com.google.common.base.Preconditions; +import org.apache.flink.util.Preconditions; /** * The base class for job vertexes. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/JobManagerCliOptions.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/JobManagerCliOptions.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/JobManagerCliOptions.java index 437693e..3598a29 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/JobManagerCliOptions.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/JobManagerCliOptions.java @@ -18,7 +18,7 @@ package org.apache.flink.runtime.jobmanager; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * The command line parameters passed to the TaskManager. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/SubmittedJobGraph.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/SubmittedJobGraph.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/SubmittedJobGraph.java index 48da3b8..faacc93 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/SubmittedJobGraph.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/SubmittedJobGraph.java @@ -23,7 +23,7 @@ import org.apache.flink.runtime.jobgraph.JobGraph; import java.io.Serializable; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * A recoverable {@link JobGraph} and {@link JobInfo}. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/ZooKeeperSubmittedJobGraphStore.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/ZooKeeperSubmittedJobGraphStore.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/ZooKeeperSubmittedJobGraphStore.java index b0a2eba..128db83 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/ZooKeeperSubmittedJobGraphStore.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/ZooKeeperSubmittedJobGraphStore.java @@ -40,8 +40,8 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.common.base.Preconditions.checkState; +import static org.apache.flink.util.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkState; /** * {@link SubmittedJobGraph} instances for JobManagers running in {@link RecoveryMode#ZOOKEEPER}. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/scheduler/CoLocationConstraint.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/scheduler/CoLocationConstraint.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/scheduler/CoLocationConstraint.java index 9ff56a4..fece894 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/scheduler/CoLocationConstraint.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/scheduler/CoLocationConstraint.java @@ -21,7 +21,7 @@ package org.apache.flink.runtime.jobmanager.scheduler; import org.apache.flink.util.AbstractID; import org.apache.flink.runtime.instance.Instance; -import com.google.common.base.Preconditions; +import org.apache.flink.util.Preconditions; import org.apache.flink.runtime.instance.SharedSlot; /** http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/scheduler/CoLocationGroup.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/scheduler/CoLocationGroup.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/scheduler/CoLocationGroup.java index 74e34e1..35c48e1 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/scheduler/CoLocationGroup.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/scheduler/CoLocationGroup.java @@ -21,10 +21,9 @@ package org.apache.flink.runtime.jobmanager.scheduler; import java.util.ArrayList; import java.util.List; -import org.apache.flink.util.AbstractID; import org.apache.flink.runtime.jobgraph.JobVertex; - -import com.google.common.base.Preconditions; +import org.apache.flink.util.AbstractID; +import org.apache.flink.util.Preconditions; /** * A Co-location group is a group of JobVertices, where the <i>i-th</i> subtask of one vertex http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/scheduler/ScheduledUnit.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/scheduler/ScheduledUnit.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/scheduler/ScheduledUnit.java index d767d62..7348c9d 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/scheduler/ScheduledUnit.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/scheduler/ScheduledUnit.java @@ -20,8 +20,7 @@ package org.apache.flink.runtime.jobmanager.scheduler; import org.apache.flink.runtime.executiongraph.Execution; import org.apache.flink.runtime.jobgraph.JobVertexID; - -import com.google.common.base.Preconditions; +import org.apache.flink.util.Preconditions; public class ScheduledUnit { http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/leaderelection/StandaloneLeaderElectionService.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/leaderelection/StandaloneLeaderElectionService.java b/flink-runtime/src/main/java/org/apache/flink/runtime/leaderelection/StandaloneLeaderElectionService.java index 1a297db..2d36616 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/leaderelection/StandaloneLeaderElectionService.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/leaderelection/StandaloneLeaderElectionService.java @@ -18,7 +18,7 @@ package org.apache.flink.runtime.leaderelection; -import com.google.common.base.Preconditions; +import org.apache.flink.util.Preconditions; import java.util.UUID; http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/leaderelection/ZooKeeperLeaderElectionService.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/leaderelection/ZooKeeperLeaderElectionService.java b/flink-runtime/src/main/java/org/apache/flink/runtime/leaderelection/ZooKeeperLeaderElectionService.java index d39bf2a..e9aaaf8 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/leaderelection/ZooKeeperLeaderElectionService.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/leaderelection/ZooKeeperLeaderElectionService.java @@ -18,7 +18,7 @@ package org.apache.flink.runtime.leaderelection; -import com.google.common.base.Preconditions; +import org.apache.flink.util.Preconditions; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.recipes.cache.ChildData; import org.apache.curator.framework.recipes.cache.NodeCache; http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/leaderretrieval/StandaloneLeaderRetrievalService.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/leaderretrieval/StandaloneLeaderRetrievalService.java b/flink-runtime/src/main/java/org/apache/flink/runtime/leaderretrieval/StandaloneLeaderRetrievalService.java index 1be879c..26a34aa 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/leaderretrieval/StandaloneLeaderRetrievalService.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/leaderretrieval/StandaloneLeaderRetrievalService.java @@ -18,7 +18,7 @@ package org.apache.flink.runtime.leaderretrieval; -import com.google.common.base.Preconditions; +import org.apache.flink.util.Preconditions; /** * Standalone implementation of the {@link LeaderRetrievalService}. The standalone implementation http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/leaderretrieval/ZooKeeperLeaderRetrievalService.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/leaderretrieval/ZooKeeperLeaderRetrievalService.java b/flink-runtime/src/main/java/org/apache/flink/runtime/leaderretrieval/ZooKeeperLeaderRetrievalService.java index e2501a3..4587bad 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/leaderretrieval/ZooKeeperLeaderRetrievalService.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/leaderretrieval/ZooKeeperLeaderRetrievalService.java @@ -18,7 +18,7 @@ package org.apache.flink.runtime.leaderretrieval; -import com.google.common.base.Preconditions; +import org.apache.flink.util.Preconditions; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.recipes.cache.ChildData; import org.apache.curator.framework.recipes.cache.NodeCache; http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/messages/webmonitor/JobDetails.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/messages/webmonitor/JobDetails.java b/flink-runtime/src/main/java/org/apache/flink/runtime/messages/webmonitor/JobDetails.java index c5f0c15..31ea516 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/messages/webmonitor/JobDetails.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/messages/webmonitor/JobDetails.java @@ -23,7 +23,7 @@ import org.apache.flink.runtime.jobgraph.JobStatus; import java.util.Arrays; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * An actor message with a detailed overview of the current status of a job. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/messages/webmonitor/JobsWithIDsOverview.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/messages/webmonitor/JobsWithIDsOverview.java b/flink-runtime/src/main/java/org/apache/flink/runtime/messages/webmonitor/JobsWithIDsOverview.java index de24c15..4cb9d8b 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/messages/webmonitor/JobsWithIDsOverview.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/messages/webmonitor/JobsWithIDsOverview.java @@ -23,7 +23,7 @@ import org.apache.flink.api.common.JobID; import java.util.ArrayList; import java.util.List; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * An overview of how many jobs are in which status. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/LargeRecordHandler.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/LargeRecordHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/LargeRecordHandler.java index 518f44c..c10d772 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/LargeRecordHandler.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/LargeRecordHandler.java @@ -18,8 +18,6 @@ package org.apache.flink.runtime.operators.sort; -import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.common.base.Preconditions.checkArgument; import java.io.IOException; import java.util.ArrayList; @@ -50,6 +48,8 @@ import org.apache.flink.util.MutableObjectIterator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.apache.flink.util.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkArgument; public class LargeRecordHandler<T> { http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/operators/util/BitSet.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/util/BitSet.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/util/BitSet.java index 6054727..be24ee2 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/util/BitSet.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/util/BitSet.java @@ -17,8 +17,8 @@ */ package org.apache.flink.runtime.operators.util; -import com.google.common.base.Preconditions; import org.apache.flink.core.memory.MemorySegment; +import org.apache.flink.util.Preconditions; public class BitSet { private MemorySegment memorySegment; http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/operators/util/BloomFilter.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/util/BloomFilter.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/util/BloomFilter.java index 0ad3c6d..5f09391 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/util/BloomFilter.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/util/BloomFilter.java @@ -18,10 +18,9 @@ package org.apache.flink.runtime.operators.util; -import com.google.common.base.Preconditions; import org.apache.flink.core.memory.MemorySegment; -import static com.google.common.base.Preconditions.checkArgument; +import static org.apache.flink.util.Preconditions.checkArgument; /** * BloomFilter is a probabilistic data structure for set membership check. BloomFilters are @@ -158,8 +157,8 @@ public class BloomFilter { private final int LONG_POSITION_MASK = 0xffffffc0; public BitSet(int byteSize) { - Preconditions.checkArgument(byteSize > 0, "bits size should be greater than 0."); - Preconditions.checkArgument(byteSize << 29 == 0, "bytes size should be integral multiple of long size(8 Bytes)."); + checkArgument(byteSize > 0, "bits size should be greater than 0."); + checkArgument(byteSize << 29 == 0, "bytes size should be integral multiple of long size(8 Bytes)."); this.length = byteSize; } @@ -223,4 +222,4 @@ public class BloomFilter { return output.toString(); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/operators/util/DistributedRuntimeUDFContext.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/util/DistributedRuntimeUDFContext.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/util/DistributedRuntimeUDFContext.java index 6c7f5f3..35c7bab 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/util/DistributedRuntimeUDFContext.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/util/DistributedRuntimeUDFContext.java @@ -33,8 +33,7 @@ import org.apache.flink.core.fs.Path; import org.apache.flink.metrics.MetricGroup; import org.apache.flink.runtime.broadcast.BroadcastVariableMaterialization; import org.apache.flink.runtime.broadcast.InitializationTypeConflictException; - -import com.google.common.base.Preconditions; +import org.apache.flink.util.Preconditions; /** * A standalone implementation of the {@link RuntimeContext}, created by runtime UDF operators. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/RuntimeEnvironment.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/RuntimeEnvironment.java b/flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/RuntimeEnvironment.java index ee4d31f..3b72730 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/RuntimeEnvironment.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/RuntimeEnvironment.java @@ -42,7 +42,7 @@ import org.apache.flink.util.SerializedValue; import java.util.Map; import java.util.concurrent.Future; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * In implementation of the {@link Environment}. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/Task.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/Task.java b/flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/Task.java index 1746f2c..017b16b 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/Task.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/Task.java @@ -79,7 +79,7 @@ import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * The Task represents one execution of a parallel subtask on a TaskManager. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/util/ProcessShutDownThread.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/util/ProcessShutDownThread.java b/flink-runtime/src/main/java/org/apache/flink/runtime/util/ProcessShutDownThread.java index ad9e10d..e19cfd7 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/util/ProcessShutDownThread.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/util/ProcessShutDownThread.java @@ -24,7 +24,7 @@ import scala.concurrent.duration.Duration; import java.util.concurrent.TimeoutException; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * JVM shut down thread awaiting actor system shut down for a certain amount http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/util/ZooKeeperUtils.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/util/ZooKeeperUtils.java b/flink-runtime/src/main/java/org/apache/flink/runtime/util/ZooKeeperUtils.java index 4bcc668..280a20e 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/util/ZooKeeperUtils.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/util/ZooKeeperUtils.java @@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory; import java.io.IOException; import java.io.Serializable; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkNotNull; public class ZooKeeperUtils { http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/zookeeper/ZooKeeperStateHandleStore.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/zookeeper/ZooKeeperStateHandleStore.java b/flink-runtime/src/main/java/org/apache/flink/runtime/zookeeper/ZooKeeperStateHandleStore.java index 1d89d64..6111f47 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/zookeeper/ZooKeeperStateHandleStore.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/zookeeper/ZooKeeperStateHandleStore.java @@ -35,7 +35,7 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * State handles backed by ZooKeeper. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/zookeeper/filesystem/FileSystemStateStorageHelper.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/zookeeper/filesystem/FileSystemStateStorageHelper.java b/flink-runtime/src/main/java/org/apache/flink/runtime/zookeeper/filesystem/FileSystemStateStorageHelper.java index bb7d94c..6692ef0 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/zookeeper/filesystem/FileSystemStateStorageHelper.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/zookeeper/filesystem/FileSystemStateStorageHelper.java @@ -18,13 +18,13 @@ package org.apache.flink.runtime.zookeeper.filesystem; -import com.google.common.base.Preconditions; import org.apache.flink.core.fs.FSDataOutputStream; import org.apache.flink.core.fs.FileSystem; import org.apache.flink.core.fs.Path; import org.apache.flink.runtime.state.StateHandle; import org.apache.flink.runtime.state.filesystem.FileSerializableStateHandle; import org.apache.flink.util.FileUtils; +import org.apache.flink.util.Preconditions; import org.apache.flink.runtime.zookeeper.StateStorageHelper; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/api/writer/RecordWriterTest.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/api/writer/RecordWriterTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/api/writer/RecordWriterTest.java index f8cd28f..70faf22 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/api/writer/RecordWriterTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/api/writer/RecordWriterTest.java @@ -43,7 +43,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkNotNull; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/netty/CancelPartitionRequestTest.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/netty/CancelPartitionRequestTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/netty/CancelPartitionRequestTest.java index eb0d772..1ff1e99 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/netty/CancelPartitionRequestTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/netty/CancelPartitionRequestTest.java @@ -37,12 +37,12 @@ import java.io.IOException; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import static com.google.common.base.Preconditions.checkNotNull; import static org.apache.flink.runtime.io.network.netty.NettyMessage.CancelPartitionRequest; import static org.apache.flink.runtime.io.network.netty.NettyMessage.PartitionRequest; import static org.apache.flink.runtime.io.network.netty.NettyTestUtil.connect; import static org.apache.flink.runtime.io.network.netty.NettyTestUtil.initServerAndClient; import static org.apache.flink.runtime.io.network.netty.NettyTestUtil.shutdown; +import static org.apache.flink.util.Preconditions.checkNotNull; import static org.junit.Assert.fail; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/netty/NettyTestUtil.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/netty/NettyTestUtil.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/netty/NettyTestUtil.java index 00e8ace..119a3d0 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/netty/NettyTestUtil.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/netty/NettyTestUtil.java @@ -29,8 +29,8 @@ import java.net.InetAddress; import java.net.InetSocketAddress; import java.util.concurrent.TimeUnit; -import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkArgument; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * Test utility for Netty server and client setup. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/consumer/LocalInputChannelTest.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/consumer/LocalInputChannelTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/consumer/LocalInputChannelTest.java index d4fcf16..8852b4f 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/consumer/LocalInputChannelTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/consumer/LocalInputChannelTest.java @@ -58,8 +58,8 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; -import static com.google.common.base.Preconditions.checkArgument; import static org.apache.flink.runtime.io.disk.iomanager.IOManager.IOMode.ASYNC; +import static org.apache.flink.util.Preconditions.checkArgument; import static org.junit.Assert.fail; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/consumer/TestInputChannel.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/consumer/TestInputChannel.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/consumer/TestInputChannel.java index 3dafffd..7ea67b3 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/consumer/TestInputChannel.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/consumer/TestInputChannel.java @@ -31,8 +31,8 @@ import org.mockito.stubbing.OngoingStubbing; import java.io.IOException; -import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkArgument; +import static org.apache.flink.util.Preconditions.checkNotNull; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/consumer/TestSingleInputGate.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/consumer/TestSingleInputGate.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/consumer/TestSingleInputGate.java index 1149000..640c11a 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/consumer/TestSingleInputGate.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/consumer/TestSingleInputGate.java @@ -35,8 +35,8 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.BlockingQueue; -import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.base.Preconditions.checkElementIndex; +import static org.apache.flink.util.Preconditions.checkArgument; +import static org.apache.flink.util.Preconditions.checkElementIndex; import static org.mockito.Matchers.any; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/util/TestBufferFactory.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/util/TestBufferFactory.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/util/TestBufferFactory.java index 4b3b465..89ee683 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/util/TestBufferFactory.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/util/TestBufferFactory.java @@ -27,8 +27,8 @@ import org.apache.flink.runtime.testutils.DiscardingRecycler; import java.util.concurrent.atomic.AtomicInteger; -import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkArgument; +import static org.apache.flink.util.Preconditions.checkNotNull; public class TestBufferFactory { http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/util/TestPartitionProducer.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/util/TestPartitionProducer.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/util/TestPartitionProducer.java index d6dd9ee..e694dfe 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/util/TestPartitionProducer.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/util/TestPartitionProducer.java @@ -26,7 +26,7 @@ import org.apache.flink.runtime.io.network.partition.consumer.BufferOrEvent; import java.util.Random; import java.util.concurrent.Callable; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * A test partition producer. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/util/TestPooledBufferProvider.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/util/TestPooledBufferProvider.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/util/TestPooledBufferProvider.java index 4893360..339b6f4 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/util/TestPooledBufferProvider.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/util/TestPooledBufferProvider.java @@ -30,7 +30,7 @@ import java.util.Queue; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.ConcurrentLinkedQueue; -import static com.google.common.base.Preconditions.checkArgument; +import static org.apache.flink.util.Preconditions.checkArgument; public class TestPooledBufferProvider implements BufferProvider { http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/util/TestSubpartitionConsumer.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/util/TestSubpartitionConsumer.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/util/TestSubpartitionConsumer.java index 18e0d4a..1b51805 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/util/TestSubpartitionConsumer.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/util/TestSubpartitionConsumer.java @@ -27,7 +27,7 @@ import org.apache.flink.runtime.io.network.partition.ResultSubpartitionView; import java.util.Random; import java.util.concurrent.Callable; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * A test subpartition view consumer. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/util/TestSubpartitionProducer.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/util/TestSubpartitionProducer.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/util/TestSubpartitionProducer.java index e5312ce..98dc1c7 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/util/TestSubpartitionProducer.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/util/TestSubpartitionProducer.java @@ -26,7 +26,7 @@ import org.apache.flink.runtime.io.network.partition.consumer.BufferOrEvent; import java.util.Random; import java.util.concurrent.Callable; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * A test subpartition producer. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/test/java/org/apache/flink/runtime/iterative/concurrent/BrokerTest.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/iterative/concurrent/BrokerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/iterative/concurrent/BrokerTest.java index e6fb374..3f2c243 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/iterative/concurrent/BrokerTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/iterative/concurrent/BrokerTest.java @@ -19,10 +19,11 @@ package org.apache.flink.runtime.iterative.concurrent; -import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import org.junit.Test; +import org.apache.flink.util.Preconditions; + import java.util.Collections; import java.util.List; import java.util.Random; http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskCancelTest.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskCancelTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskCancelTest.java index fc5a4a3..690c042 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskCancelTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskCancelTest.java @@ -47,10 +47,10 @@ import scala.concurrent.Await; import scala.concurrent.Future; import scala.concurrent.duration.FiniteDuration; -import static com.google.common.base.Preconditions.checkNotNull; import static org.apache.flink.runtime.messages.JobManagerMessages.CancelJob; import static org.apache.flink.runtime.messages.JobManagerMessages.CancellationFailure; import static org.apache.flink.runtime.messages.JobManagerMessages.RequestJobStatus; +import static org.apache.flink.util.Preconditions.checkNotNull; public class TaskCancelTest { http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/JobManagerActorTestUtils.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/JobManagerActorTestUtils.java b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/JobManagerActorTestUtils.java index 66e1d9b..360cb1f 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/JobManagerActorTestUtils.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/JobManagerActorTestUtils.java @@ -29,12 +29,12 @@ import scala.concurrent.Future; import scala.concurrent.duration.Deadline; import scala.concurrent.duration.FiniteDuration; -import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.base.Preconditions.checkNotNull; import static org.apache.flink.runtime.messages.JobManagerMessages.JobNotFound; import static org.apache.flink.runtime.messages.JobManagerMessages.RequestJobStatus; import static org.apache.flink.runtime.messages.JobManagerMessages.getRequestJobStatus; import static org.apache.flink.runtime.messages.JobManagerMessages.getRequestNumberRegisteredTaskManager; +import static org.apache.flink.util.Preconditions.checkArgument; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * JobManager actor test utilities. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/JobManagerProcess.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/JobManagerProcess.java b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/JobManagerProcess.java index 81aedfb..fac6162 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/JobManagerProcess.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/JobManagerProcess.java @@ -38,8 +38,8 @@ import java.util.concurrent.CountDownLatch; import java.util.regex.Matcher; import java.util.regex.Pattern; -import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkArgument; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * A {@link JobManager} instance running in a separate JVM. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/TaskManagerProcess.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/TaskManagerProcess.java b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/TaskManagerProcess.java index dfaed37..97e7cca 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/TaskManagerProcess.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/TaskManagerProcess.java @@ -30,8 +30,8 @@ import java.util.ArrayList; import java.util.Map; import java.util.concurrent.CountDownLatch; -import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkArgument; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * A {@link TaskManager} instance running in a separate JVM. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/TestJvmProcess.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/TestJvmProcess.java b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/TestJvmProcess.java index a101b1a..73a0088 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/TestJvmProcess.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/TestJvmProcess.java @@ -28,11 +28,11 @@ import java.io.IOException; import java.io.StringWriter; import java.util.Arrays; -import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.base.Preconditions.checkNotNull; import static org.apache.flink.runtime.testutils.CommonTestUtils.createTemporaryLog4JProperties; import static org.apache.flink.runtime.testutils.CommonTestUtils.getCurrentClasspath; import static org.apache.flink.runtime.testutils.CommonTestUtils.getJavaCommandPath; +import static org.apache.flink.util.Preconditions.checkArgument; +import static org.apache.flink.util.Preconditions.checkNotNull; import static org.junit.Assert.fail; /** http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/ZooKeeperTestUtils.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/ZooKeeperTestUtils.java b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/ZooKeeperTestUtils.java index da3c02d..2796337 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/ZooKeeperTestUtils.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/ZooKeeperTestUtils.java @@ -23,7 +23,7 @@ import org.apache.flink.configuration.Configuration; import org.apache.flink.runtime.jobmanager.RecoveryMode; import org.apache.flink.runtime.state.filesystem.FsStateBackendFactory; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * ZooKeeper test utilities. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-scala/src/main/java/org/apache/flink/api/scala/operators/ScalaAggregateOperator.java ---------------------------------------------------------------------- diff --git a/flink-scala/src/main/java/org/apache/flink/api/scala/operators/ScalaAggregateOperator.java b/flink-scala/src/main/java/org/apache/flink/api/scala/operators/ScalaAggregateOperator.java index 292ffcf..80e91ac 100644 --- a/flink-scala/src/main/java/org/apache/flink/api/scala/operators/ScalaAggregateOperator.java +++ b/flink-scala/src/main/java/org/apache/flink/api/scala/operators/ScalaAggregateOperator.java @@ -42,8 +42,8 @@ import org.apache.flink.api.java.typeutils.TupleTypeInfoBase; import org.apache.flink.api.java.typeutils.runtime.TupleSerializerBase; import org.apache.flink.configuration.Configuration; import org.apache.flink.util.Collector; +import org.apache.flink.util.Preconditions; -import com.google.common.base.Preconditions; import scala.Product; /** http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-scala/src/main/scala/org/apache/flink/api/scala/ExecutionEnvironment.scala ---------------------------------------------------------------------- diff --git a/flink-scala/src/main/scala/org/apache/flink/api/scala/ExecutionEnvironment.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/ExecutionEnvironment.scala index 5c923cb..4475bc8 100644 --- a/flink-scala/src/main/scala/org/apache/flink/api/scala/ExecutionEnvironment.scala +++ b/flink-scala/src/main/scala/org/apache/flink/api/scala/ExecutionEnvironment.scala @@ -18,7 +18,6 @@ package org.apache.flink.api.scala import com.esotericsoftware.kryo.Serializer -import com.google.common.base.Preconditions import org.apache.flink.annotation.{PublicEvolving, Public} import org.apache.flink.api.common.io.{FileInputFormat, InputFormat} import org.apache.flink.api.common.restartstrategy.RestartStrategies.RestartStrategyConfiguration @@ -34,7 +33,7 @@ import org.apache.flink.api.scala.hadoop.{mapred, mapreduce} import org.apache.flink.configuration.Configuration import org.apache.flink.core.fs.Path import org.apache.flink.types.StringValue -import org.apache.flink.util.{NumberSequenceIterator, SplittableIterator} +import org.apache.flink.util.{NumberSequenceIterator, Preconditions, SplittableIterator} import org.apache.hadoop.fs.{Path => HadoopPath} import org.apache.hadoop.mapred.{FileInputFormat => MapredFileInputFormat, InputFormat => MapredInputFormat, JobConf} import org.apache.hadoop.mapreduce.lib.input.{FileInputFormat => MapreduceFileInputFormat} http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-streaming-connectors/flink-connector-elasticsearch2/src/main/java/org/apache/flink/streaming/connectors/elasticsearch2/ElasticsearchSink.java ---------------------------------------------------------------------- diff --git a/flink-streaming-connectors/flink-connector-elasticsearch2/src/main/java/org/apache/flink/streaming/connectors/elasticsearch2/ElasticsearchSink.java b/flink-streaming-connectors/flink-connector-elasticsearch2/src/main/java/org/apache/flink/streaming/connectors/elasticsearch2/ElasticsearchSink.java index a8a53e5..e839589 100644 --- a/flink-streaming-connectors/flink-connector-elasticsearch2/src/main/java/org/apache/flink/streaming/connectors/elasticsearch2/ElasticsearchSink.java +++ b/flink-streaming-connectors/flink-connector-elasticsearch2/src/main/java/org/apache/flink/streaming/connectors/elasticsearch2/ElasticsearchSink.java @@ -16,11 +16,11 @@ */ package org.apache.flink.streaming.connectors.elasticsearch2; -import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import org.apache.flink.api.java.utils.ParameterTool; import org.apache.flink.configuration.Configuration; import org.apache.flink.streaming.api.functions.sink.RichSinkFunction; +import org.apache.flink.util.Preconditions; import org.elasticsearch.action.bulk.BulkItemResponse; import org.elasticsearch.action.bulk.BulkProcessor; import org.elasticsearch.action.bulk.BulkRequest; http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-streaming-connectors/flink-connector-rabbitmq/pom.xml ---------------------------------------------------------------------- diff --git a/flink-streaming-connectors/flink-connector-rabbitmq/pom.xml b/flink-streaming-connectors/flink-connector-rabbitmq/pom.xml index 55bbadb..4413c69 100644 --- a/flink-streaming-connectors/flink-connector-rabbitmq/pom.xml +++ b/flink-streaming-connectors/flink-connector-rabbitmq/pom.xml @@ -55,12 +55,6 @@ under the License. <version>${rabbitmq.version}</version> </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <version>${guava.version}</version> - </dependency> - </dependencies> </project> http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-streaming-connectors/flink-connector-rabbitmq/src/main/java/org/apache/flink/streaming/connectors/rabbitmq/RMQSource.java ---------------------------------------------------------------------- diff --git a/flink-streaming-connectors/flink-connector-rabbitmq/src/main/java/org/apache/flink/streaming/connectors/rabbitmq/RMQSource.java b/flink-streaming-connectors/flink-connector-rabbitmq/src/main/java/org/apache/flink/streaming/connectors/rabbitmq/RMQSource.java index 20a8b0b..0892d61 100644 --- a/flink-streaming-connectors/flink-connector-rabbitmq/src/main/java/org/apache/flink/streaming/connectors/rabbitmq/RMQSource.java +++ b/flink-streaming-connectors/flink-connector-rabbitmq/src/main/java/org/apache/flink/streaming/connectors/rabbitmq/RMQSource.java @@ -20,7 +20,6 @@ package org.apache.flink.streaming.connectors.rabbitmq; import java.io.IOException; import java.util.List; -import com.google.common.base.Preconditions; import org.apache.flink.api.common.functions.RuntimeContext; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.java.typeutils.ResultTypeQueryable; @@ -30,6 +29,7 @@ import org.apache.flink.streaming.api.functions.source.MultipleIdsMessageAcknowl import org.apache.flink.streaming.api.operators.StreamingRuntimeContext; import org.apache.flink.streaming.connectors.rabbitmq.common.RMQConnectionConfig; import org.apache.flink.streaming.util.serialization.DeserializationSchema; +import org.apache.flink.util.Preconditions; import com.rabbitmq.client.Channel; import com.rabbitmq.client.Connection; http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/DataStream.java ---------------------------------------------------------------------- diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/DataStream.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/DataStream.java index 69ed878..859b962 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/DataStream.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/DataStream.java @@ -92,8 +92,7 @@ import org.apache.flink.streaming.runtime.partitioner.ShufflePartitioner; import org.apache.flink.streaming.runtime.partitioner.StreamPartitioner; import org.apache.flink.streaming.util.keys.KeySelectorUtil; import org.apache.flink.streaming.util.serialization.SerializationSchema; - -import com.google.common.base.Preconditions; +import org.apache.flink.util.Preconditions; /** * A DataStream represents a stream of elements of the same type. A DataStream http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/StreamProjection.java ---------------------------------------------------------------------- diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/StreamProjection.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/StreamProjection.java index 0392aa4..8537318 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/StreamProjection.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/StreamProjection.java @@ -47,8 +47,7 @@ import org.apache.flink.api.java.tuple.Tuple8; import org.apache.flink.api.java.tuple.Tuple9; import org.apache.flink.api.java.typeutils.TupleTypeInfo; import org.apache.flink.streaming.api.operators.StreamProject; - -import com.google.common.base.Preconditions; +import org.apache.flink.util.Preconditions; @PublicEvolving public class StreamProjection<IN> { http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/StreamContextEnvironment.java ---------------------------------------------------------------------- diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/StreamContextEnvironment.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/StreamContextEnvironment.java index c0f3a4a..5999143 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/StreamContextEnvironment.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/StreamContextEnvironment.java @@ -17,7 +17,6 @@ package org.apache.flink.streaming.api.environment; -import com.google.common.base.Preconditions; import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.api.common.JobExecutionResult; import org.apache.flink.client.program.ContextEnvironment; @@ -26,6 +25,8 @@ import org.apache.flink.client.program.DetachedEnvironment; import org.apache.flink.configuration.ConfigConstants; import org.apache.flink.configuration.GlobalConfiguration; import org.apache.flink.streaming.api.graph.StreamGraph; +import org.apache.flink.util.Preconditions; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/StreamExecutionEnvironment.java ---------------------------------------------------------------------- diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/StreamExecutionEnvironment.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/StreamExecutionEnvironment.java index 1cd052c..d6bfc02 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/StreamExecutionEnvironment.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/StreamExecutionEnvironment.java @@ -18,7 +18,6 @@ package org.apache.flink.streaming.api.environment; import com.esotericsoftware.kryo.Serializer; -import com.google.common.base.Preconditions; import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.annotation.Internal; @@ -72,6 +71,7 @@ import org.apache.flink.streaming.api.operators.StoppableStreamSource; import org.apache.flink.streaming.api.operators.StreamSource; import org.apache.flink.runtime.state.AbstractStateBackend; import org.apache.flink.streaming.api.transformations.StreamTransformation; +import org.apache.flink.util.Preconditions; import org.apache.flink.util.SplittableIterator; import java.io.IOException; @@ -82,8 +82,6 @@ import java.util.Collection; import java.util.Iterator; import java.util.List; -import static java.util.Objects.requireNonNull; - /** * An ExecutionEnvironment for streaming jobs. An instance of it is * necessary to construct streaming topologies. @@ -411,7 +409,7 @@ public abstract class StreamExecutionEnvironment { */ @PublicEvolving public StreamExecutionEnvironment setStateBackend(AbstractStateBackend backend) { - this.defaultStateBackend = requireNonNull(backend); + this.defaultStateBackend = Preconditions.checkNotNull(backend); return this; } @@ -598,7 +596,7 @@ public abstract class StreamExecutionEnvironment { */ @PublicEvolving public void setStreamTimeCharacteristic(TimeCharacteristic characteristic) { - this.timeCharacteristic = requireNonNull(characteristic); + this.timeCharacteristic = Preconditions.checkNotNull(characteristic); if (characteristic == TimeCharacteristic.ProcessingTime) { getConfig().setAutoWatermarkInterval(0); } else { http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/SocketClientSink.java ---------------------------------------------------------------------- diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/SocketClientSink.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/SocketClientSink.java index 3424cda..807735d 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/SocketClientSink.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/SocketClientSink.java @@ -29,8 +29,8 @@ import org.apache.flink.streaming.util.serialization.SerializationSchema; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkArgument; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * Socket client that acts as a streaming sink. The data is sent to a Socket as a byte array. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/SocketTextStreamFunction.java ---------------------------------------------------------------------- diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/SocketTextStreamFunction.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/SocketTextStreamFunction.java index 21e4394..3ae54b6 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/SocketTextStreamFunction.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/SocketTextStreamFunction.java @@ -28,8 +28,8 @@ import java.io.InputStreamReader; import java.net.InetSocketAddress; import java.net.Socket; -import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkArgument; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * A source function that reads strings from a socket. The source will read bytes from the socket stream http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/StreamTransformation.java ---------------------------------------------------------------------- diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/StreamTransformation.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/StreamTransformation.java index 9e61ea0..1d2a1bb 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/StreamTransformation.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/StreamTransformation.java @@ -17,7 +17,6 @@ */ package org.apache.flink.streaming.api.transformations; -import com.google.common.base.Preconditions; import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.functions.InvalidTypesException; @@ -25,6 +24,7 @@ import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.java.typeutils.MissingTypeInfo; import org.apache.flink.streaming.api.graph.StreamGraph; import org.apache.flink.streaming.api.operators.ChainingStrategy; +import org.apache.flink.util.Preconditions; import java.util.Collection; http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/time/Time.java ---------------------------------------------------------------------- diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/time/Time.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/time/Time.java index 7943a23..b97efa2 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/time/Time.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/time/Time.java @@ -20,7 +20,7 @@ package org.apache.flink.streaming.api.windowing.time; import java.util.concurrent.TimeUnit; import org.apache.flink.annotation.Public; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * The definition of a time interval for windowing. The time characteristic referred http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/RecordWriterOutput.java ---------------------------------------------------------------------- diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/RecordWriterOutput.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/RecordWriterOutput.java index a6f4237..c9d579f 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/RecordWriterOutput.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/RecordWriterOutput.java @@ -31,7 +31,7 @@ import org.apache.flink.streaming.runtime.streamrecord.MultiplexingStreamRecordS import org.apache.flink.streaming.runtime.streamrecord.StreamRecord; import org.apache.flink.streaming.runtime.streamrecord.StreamRecordSerializer; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * Implementation of {@link Output} that sends data using a {@link RecordWriter}. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/StreamRecordWriter.java ---------------------------------------------------------------------- diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/StreamRecordWriter.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/StreamRecordWriter.java index 80680ce..f46b366 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/StreamRecordWriter.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/StreamRecordWriter.java @@ -25,7 +25,7 @@ import org.apache.flink.runtime.io.network.api.writer.ChannelSelector; import org.apache.flink.runtime.io.network.api.writer.RecordWriter; import org.apache.flink.runtime.io.network.api.writer.ResultPartitionWriter; -import static com.google.common.base.Preconditions.checkArgument; +import static org.apache.flink.util.Preconditions.checkArgument; /** * This record writer keeps data in buffers at most for a certain timeout. It spawns a separate thread http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/streamrecord/StreamRecordSerializer.java ---------------------------------------------------------------------- diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/streamrecord/StreamRecordSerializer.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/streamrecord/StreamRecordSerializer.java index d259e05..71b43fe 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/streamrecord/StreamRecordSerializer.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/streamrecord/StreamRecordSerializer.java @@ -20,11 +20,11 @@ package org.apache.flink.streaming.runtime.streamrecord; import java.io.IOException; -import com.google.common.base.Preconditions; import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.TypeSerializer; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.util.Preconditions; /** * Serializer for {@link StreamRecord}. This version ignores timestamps and only deals with http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-streaming-java/src/test/java/org/apache/flink/streaming/util/TestStreamEnvironment.java ---------------------------------------------------------------------- diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/util/TestStreamEnvironment.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/util/TestStreamEnvironment.java index e44815d..c700102 100644 --- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/util/TestStreamEnvironment.java +++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/util/TestStreamEnvironment.java @@ -18,13 +18,13 @@ package org.apache.flink.streaming.util; -import com.google.common.base.Preconditions; import org.apache.flink.api.common.JobExecutionResult; import org.apache.flink.runtime.jobgraph.JobGraph; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironmentFactory; import org.apache.flink.streaming.api.graph.StreamGraph; import org.apache.flink.test.util.ForkableFlinkMiniCluster; +import org.apache.flink.util.Preconditions; /** * A StreamExecutionEnvironment that executes its jobs on a test cluster. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-tests/src/test/java/org/apache/flink/test/recovery/ChaosMonkeyITCase.java ---------------------------------------------------------------------- diff --git a/flink-tests/src/test/java/org/apache/flink/test/recovery/ChaosMonkeyITCase.java b/flink-tests/src/test/java/org/apache/flink/test/recovery/ChaosMonkeyITCase.java index 28bfcbc..e97532c 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/recovery/ChaosMonkeyITCase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/recovery/ChaosMonkeyITCase.java @@ -67,7 +67,7 @@ import java.util.Random; import java.util.UUID; import java.util.concurrent.TimeUnit; -import static com.google.common.base.Preconditions.checkArgument; +import static org.apache.flink.util.Preconditions.checkArgument; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-tests/src/test/java/org/apache/flink/test/recovery/JobManagerHACheckpointRecoveryITCase.java ---------------------------------------------------------------------- diff --git a/flink-tests/src/test/java/org/apache/flink/test/recovery/JobManagerHACheckpointRecoveryITCase.java b/flink-tests/src/test/java/org/apache/flink/test/recovery/JobManagerHACheckpointRecoveryITCase.java index b9284dc..262f78a 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/recovery/JobManagerHACheckpointRecoveryITCase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/recovery/JobManagerHACheckpointRecoveryITCase.java @@ -69,8 +69,8 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLongArray; import java.util.concurrent.atomic.AtomicReference; -import static com.google.common.base.Preconditions.checkArgument; import static org.apache.flink.runtime.messages.JobManagerMessages.SubmitJob; +import static org.apache.flink.util.Preconditions.checkArgument; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertTrue;