[FLINK-4032] Replace all usage of Guava Preconditions This closes #2084
Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/c4bbed9e Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/c4bbed9e Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/c4bbed9e Branch: refs/heads/master Commit: c4bbed9e4d43950244150c5ffcfd4a47f6f1c64e Parents: 279777f Author: zentol <ches...@apache.org> Authored: Wed Jun 8 16:01:19 2016 +0200 Committer: zentol <ches...@apache.org> Committed: Wed Jun 15 13:58:38 2016 +0200 ---------------------------------------------------------------------- .../java/org/apache/flink/util/Preconditions.java | 17 +++++++++++++++++ .../runtime/aggregate/AggregateMapFunction.scala | 2 +- .../aggregate/AggregateReduceGroupFunction.scala | 2 +- .../org/apache/flink/optimizer/plan/Channel.java | 2 +- .../webmonitor/BackPressureStatsTracker.java | 4 ++-- .../runtime/webmonitor/ExecutionGraphHolder.java | 4 ++-- .../runtime/webmonitor/JobManagerRetriever.java | 2 +- .../webmonitor/OperatorBackPressureStats.java | 4 ++-- .../runtime/webmonitor/RuntimeMonitorHandler.java | 2 +- .../webmonitor/RuntimeMonitorHandlerBase.java | 2 +- .../flink/runtime/webmonitor/StackTraceSample.java | 2 +- .../webmonitor/StackTraceSampleCoordinator.java | 4 ++-- .../runtime/webmonitor/WebRuntimeMonitor.java | 2 +- .../webmonitor/files/StaticFileServerHandler.java | 2 +- .../handlers/ClusterOverviewHandler.java | 2 +- .../handlers/CurrentJobsOverviewHandler.java | 2 +- .../webmonitor/handlers/HandlerRedirectUtils.java | 2 +- .../handlers/JobVertexBackPressureHandler.java | 4 ++-- .../webmonitor/handlers/TaskManagerLogHandler.java | 2 +- .../org/apache/flink/runtime/blob/BlobServer.java | 2 +- .../org/apache/flink/runtime/blob/BlobUtils.java | 2 +- .../flink/runtime/blob/FileSystemBlobStore.java | 2 +- .../BroadcastVariableMaterialization.java | 3 +-- .../runtime/checkpoint/CheckpointCoordinator.java | 4 ++-- .../CheckpointCoordinatorDeActivator.java | 2 +- .../runtime/checkpoint/FileSystemStateStore.java | 2 +- .../flink/runtime/checkpoint/HeapStateStore.java | 2 +- .../runtime/checkpoint/SavepointCoordinator.java | 2 +- .../SavepointCoordinatorDeActivator.java | 2 +- .../StandaloneCompletedCheckpointStore.java | 4 ++-- .../flink/runtime/checkpoint/SubtaskState.java | 2 +- .../checkpoint/ZooKeeperCheckpointIDCounter.java | 2 +- .../ZooKeeperCheckpointRecoveryFactory.java | 2 +- .../ZooKeeperCompletedCheckpointStore.java | 4 ++-- .../checkpoint/stats/OperatorCheckpointStats.java | 2 +- .../stats/SimpleCheckpointStatsTracker.java | 2 +- .../org/apache/flink/runtime/client/JobClient.java | 2 +- .../flink/runtime/client/JobClientActor.java | 2 +- .../clusterframework/FlinkResourceManager.java | 2 +- .../messages/ReconnectResourceManager.java | 2 +- .../messages/RegisterResourceManager.java | 2 +- .../InputChannelDeploymentDescriptor.java | 2 +- .../deployment/InputGateDeploymentDescriptor.java | 4 ++-- .../PartialInputChannelDeploymentDescriptor.java | 2 +- .../ResultPartitionDeploymentDescriptor.java | 4 ++-- .../deployment/ResultPartitionLocation.java | 2 +- .../deployment/TaskDeploymentDescriptor.java | 4 ++-- .../librarycache/BlobLibraryCacheManager.java | 4 ++-- .../flink/runtime/executiongraph/Execution.java | 2 +- .../runtime/executiongraph/ExecutionGraph.java | 2 +- .../runtime/executiongraph/IntermediateResult.java | 4 ++-- .../restart/FixedDelayRestartStrategy.java | 2 +- .../runtime/io/disk/FileChannelInputView.java | 8 ++++---- .../runtime/io/disk/FileChannelOutputView.java | 8 ++++---- .../io/disk/SeekableFileChannelInputView.java | 6 +++--- .../io/disk/iomanager/AbstractFileIOChannel.java | 4 ++-- .../disk/iomanager/AsynchronousFileIOChannel.java | 2 +- .../runtime/io/disk/iomanager/IOManagerAsync.java | 4 ++-- .../flink/runtime/io/network/ConnectionID.java | 4 ++-- .../runtime/io/network/NetworkEnvironment.java | 2 +- .../io/network/api/reader/AbstractReader.java | 2 +- .../flink/runtime/io/network/buffer/Buffer.java | 4 ++-- .../runtime/io/network/buffer/LocalBufferPool.java | 6 +++--- .../io/network/buffer/NetworkBufferPool.java | 2 +- .../runtime/io/network/netty/NettyBufferPool.java | 2 +- .../runtime/io/network/netty/NettyClient.java | 2 +- .../runtime/io/network/netty/NettyConfig.java | 4 ++-- .../runtime/io/network/netty/NettyServer.java | 4 ++-- .../io/network/netty/PartitionRequestClient.java | 2 +- .../netty/PartitionRequestClientHandler.java | 2 +- .../io/network/netty/PartitionRequestQueue.java | 2 +- .../network/partition/PipelinedSubpartition.java | 2 +- .../partition/PipelinedSubpartitionView.java | 2 +- .../io/network/partition/ResultPartition.java | 8 ++++---- .../network/partition/ResultPartitionManager.java | 2 +- .../network/partition/SpillableSubpartition.java | 2 +- .../partition/SpillableSubpartitionView.java | 4 ++-- .../partition/SpilledSubpartitionViewAsyncIO.java | 4 ++-- .../partition/SpilledSubpartitionViewSyncIO.java | 4 ++-- .../network/partition/consumer/BufferOrEvent.java | 4 ++-- .../network/partition/consumer/InputChannel.java | 4 ++-- .../partition/consumer/LocalInputChannel.java | 4 ++-- .../partition/consumer/RemoteInputChannel.java | 4 ++-- .../partition/consumer/SingleInputGate.java | 6 +++--- .../network/partition/consumer/UnionInputGate.java | 4 ++-- .../partition/consumer/UnknownInputChannel.java | 2 +- .../task/IterationSynchronizationSinkTask.java | 3 +-- .../runtime/iterative/task/SyncEventHandler.java | 3 +-- .../runtime/jobgraph/IntermediateDataSet.java | 2 +- .../apache/flink/runtime/jobgraph/JobVertex.java | 3 +-- .../runtime/jobmanager/JobManagerCliOptions.java | 2 +- .../runtime/jobmanager/SubmittedJobGraph.java | 2 +- .../ZooKeeperSubmittedJobGraphStore.java | 4 ++-- .../jobmanager/scheduler/CoLocationConstraint.java | 2 +- .../jobmanager/scheduler/CoLocationGroup.java | 5 ++--- .../jobmanager/scheduler/ScheduledUnit.java | 3 +-- .../StandaloneLeaderElectionService.java | 2 +- .../ZooKeeperLeaderElectionService.java | 2 +- .../StandaloneLeaderRetrievalService.java | 2 +- .../ZooKeeperLeaderRetrievalService.java | 2 +- .../runtime/messages/webmonitor/JobDetails.java | 2 +- .../messages/webmonitor/JobsWithIDsOverview.java | 2 +- .../runtime/operators/sort/LargeRecordHandler.java | 4 ++-- .../flink/runtime/operators/util/BitSet.java | 2 +- .../flink/runtime/operators/util/BloomFilter.java | 9 ++++----- .../util/DistributedRuntimeUDFContext.java | 3 +-- .../runtime/taskmanager/RuntimeEnvironment.java | 2 +- .../org/apache/flink/runtime/taskmanager/Task.java | 2 +- .../flink/runtime/util/ProcessShutDownThread.java | 2 +- .../apache/flink/runtime/util/ZooKeeperUtils.java | 2 +- .../zookeeper/ZooKeeperStateHandleStore.java | 2 +- .../filesystem/FileSystemStateStorageHelper.java | 2 +- .../io/network/api/writer/RecordWriterTest.java | 2 +- .../network/netty/CancelPartitionRequestTest.java | 2 +- .../runtime/io/network/netty/NettyTestUtil.java | 4 ++-- .../partition/consumer/LocalInputChannelTest.java | 2 +- .../partition/consumer/TestInputChannel.java | 4 ++-- .../partition/consumer/TestSingleInputGate.java | 4 ++-- .../runtime/io/network/util/TestBufferFactory.java | 4 ++-- .../io/network/util/TestPartitionProducer.java | 2 +- .../io/network/util/TestPooledBufferProvider.java | 2 +- .../io/network/util/TestSubpartitionConsumer.java | 2 +- .../io/network/util/TestSubpartitionProducer.java | 2 +- .../runtime/iterative/concurrent/BrokerTest.java | 3 ++- .../flink/runtime/taskmanager/TaskCancelTest.java | 2 +- .../testutils/JobManagerActorTestUtils.java | 4 ++-- .../flink/runtime/testutils/JobManagerProcess.java | 4 ++-- .../runtime/testutils/TaskManagerProcess.java | 4 ++-- .../flink/runtime/testutils/TestJvmProcess.java | 4 ++-- .../runtime/testutils/ZooKeeperTestUtils.java | 2 +- .../scala/operators/ScalaAggregateOperator.java | 2 +- .../flink/api/scala/ExecutionEnvironment.scala | 3 +-- .../elasticsearch2/ElasticsearchSink.java | 2 +- .../flink-connector-rabbitmq/pom.xml | 6 ------ .../streaming/connectors/rabbitmq/RMQSource.java | 2 +- .../flink/streaming/api/datastream/DataStream.java | 3 +-- .../streaming/api/datastream/StreamProjection.java | 3 +-- .../api/environment/StreamContextEnvironment.java | 3 ++- .../environment/StreamExecutionEnvironment.java | 8 +++----- .../api/functions/sink/SocketClientSink.java | 4 ++-- .../functions/source/SocketTextStreamFunction.java | 4 ++-- .../api/transformations/StreamTransformation.java | 2 +- .../flink/streaming/api/windowing/time/Time.java | 2 +- .../streaming/runtime/io/RecordWriterOutput.java | 2 +- .../streaming/runtime/io/StreamRecordWriter.java | 2 +- .../streamrecord/StreamRecordSerializer.java | 2 +- .../streaming/util/TestStreamEnvironment.java | 2 +- .../flink/test/recovery/ChaosMonkeyITCase.java | 2 +- .../JobManagerHACheckpointRecoveryITCase.java | 2 +- .../apache/flink/yarn/TestingFlinkYarnClient.java | 2 +- .../org/apache/flink/yarn/FlinkYarnCluster.java | 4 ++-- tools/maven/checkstyle.xml | 11 +++++++++++ 152 files changed, 240 insertions(+), 229 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-core/src/main/java/org/apache/flink/util/Preconditions.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/util/Preconditions.java b/flink-core/src/main/java/org/apache/flink/util/Preconditions.java index 25fefe5..ea6b9dd 100644 --- a/flink-core/src/main/java/org/apache/flink/util/Preconditions.java +++ b/flink-core/src/main/java/org/apache/flink/util/Preconditions.java @@ -234,6 +234,23 @@ public final class Preconditions { } } + /** + * Ensures that the given index is valid for an array, list or string of the given size. + * + * @param index index to check + * @param size size of the array, list or string + * @param errorMessage The message for the {@code IndexOutOfBoundsException} that is thrown if the check fails. + * + * @throws IllegalArgumentException Thrown, if size is negative. + * @throws IndexOutOfBoundsException Thrown, if the index negative or greater than or equal to size + */ + public static void checkElementIndex(int index, int size, @Nullable String errorMessage) { + checkArgument(size >= 0, "Size was negative."); + if (index < 0 || index >= size) { + throw new IndexOutOfBoundsException(String.valueOf(errorMessage) + " Index: " + index + ", Size: " + size); + } + } + // ------------------------------------------------------------------------ // Utilities // ------------------------------------------------------------------------ http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/AggregateMapFunction.scala ---------------------------------------------------------------------- diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/AggregateMapFunction.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/AggregateMapFunction.scala index 26464e0..d848d21 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/AggregateMapFunction.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/AggregateMapFunction.scala @@ -17,12 +17,12 @@ */ package org.apache.flink.api.table.runtime.aggregate -import com.google.common.base.Preconditions import org.apache.flink.api.common.functions.RichMapFunction import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.java.typeutils.ResultTypeQueryable import org.apache.flink.api.table.Row import org.apache.flink.configuration.Configuration +import org.apache.flink.util.Preconditions class AggregateMapFunction[IN, OUT]( private val aggregates: Array[Aggregate[_]], http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/AggregateReduceGroupFunction.scala ---------------------------------------------------------------------- diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/AggregateReduceGroupFunction.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/AggregateReduceGroupFunction.scala index 4fea7ba..738953d 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/AggregateReduceGroupFunction.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/aggregate/AggregateReduceGroupFunction.scala @@ -19,11 +19,11 @@ package org.apache.flink.api.table.runtime.aggregate import java.lang.Iterable -import com.google.common.base.Preconditions import org.apache.flink.api.common.functions.{CombineFunction, RichGroupReduceFunction, RichMapPartitionFunction} import org.apache.flink.api.table.Row import org.apache.flink.configuration.Configuration import org.apache.flink.util.Collector +import org.apache.flink.util.Preconditions import scala.collection.JavaConversions._ http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/Channel.java ---------------------------------------------------------------------- diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/Channel.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/Channel.java index bd2a594..df3a853 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/Channel.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plan/Channel.java @@ -36,7 +36,7 @@ import org.apache.flink.runtime.io.network.DataExchangeMode; import org.apache.flink.runtime.operators.shipping.ShipStrategyType; import org.apache.flink.runtime.operators.util.LocalStrategy; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * A Channel represents the result produced by an operator and the data exchange http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/BackPressureStatsTracker.java ---------------------------------------------------------------------- diff --git a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/BackPressureStatsTracker.java b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/BackPressureStatsTracker.java index db88ffd..34d8069 100644 --- a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/BackPressureStatsTracker.java +++ b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/BackPressureStatsTracker.java @@ -41,8 +41,8 @@ import java.util.Map.Entry; import java.util.Set; 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; /** * Back pressure statistics tracker. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/ExecutionGraphHolder.java ---------------------------------------------------------------------- diff --git a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/ExecutionGraphHolder.java b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/ExecutionGraphHolder.java index f680306..7691874 100644 --- a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/ExecutionGraphHolder.java +++ b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/ExecutionGraphHolder.java @@ -31,7 +31,7 @@ import scala.concurrent.duration.FiniteDuration; import java.util.WeakHashMap; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * Gateway to obtaining an {@link ExecutionGraph} from a source, like JobManager or Archive. @@ -95,4 +95,4 @@ public class ExecutionGraphHolder { throw new RuntimeException("Error requesting execution graph", e); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/JobManagerRetriever.java ---------------------------------------------------------------------- diff --git a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/JobManagerRetriever.java b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/JobManagerRetriever.java index 93db280..7aab31f 100644 --- a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/JobManagerRetriever.java +++ b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/JobManagerRetriever.java @@ -42,7 +42,7 @@ import scala.concurrent.duration.FiniteDuration; import java.util.UUID; import java.util.concurrent.TimeoutException; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * Retrieves and stores the actor gateway to the current leading JobManager. In case of an error, http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/OperatorBackPressureStats.java ---------------------------------------------------------------------- diff --git a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/OperatorBackPressureStats.java b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/OperatorBackPressureStats.java index cb262e3..bfd5be2 100644 --- a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/OperatorBackPressureStats.java +++ b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/OperatorBackPressureStats.java @@ -20,8 +20,8 @@ package org.apache.flink.runtime.webmonitor; 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.util.Preconditions.checkArgument; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * Back pressure statistics of multiple tasks. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/RuntimeMonitorHandler.java ---------------------------------------------------------------------- diff --git a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/RuntimeMonitorHandler.java b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/RuntimeMonitorHandler.java index 36fd83a..be7f952 100644 --- a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/RuntimeMonitorHandler.java +++ b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/RuntimeMonitorHandler.java @@ -43,7 +43,7 @@ import java.nio.charset.Charset; import java.util.HashMap; import java.util.Map; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * The Netty channel handler that processes all HTTP requests. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/RuntimeMonitorHandlerBase.java ---------------------------------------------------------------------- diff --git a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/RuntimeMonitorHandlerBase.java b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/RuntimeMonitorHandlerBase.java index 7a38de4..182b5f9 100644 --- a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/RuntimeMonitorHandlerBase.java +++ b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/RuntimeMonitorHandlerBase.java @@ -33,7 +33,7 @@ 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.util.Preconditions.checkNotNull; /** * The Netty channel handler that processes all HTTP requests. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/StackTraceSample.java ---------------------------------------------------------------------- diff --git a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/StackTraceSample.java b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/StackTraceSample.java index c2906d4..b2576b0 100644 --- a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/StackTraceSample.java +++ b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/StackTraceSample.java @@ -24,7 +24,7 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import static com.google.common.base.Preconditions.checkArgument; +import static org.apache.flink.util.Preconditions.checkArgument; /** * A sample of stack traces for one or more tasks. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/StackTraceSampleCoordinator.java ---------------------------------------------------------------------- diff --git a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/StackTraceSampleCoordinator.java b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/StackTraceSampleCoordinator.java index bbfb530..c872ab2 100644 --- a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/StackTraceSampleCoordinator.java +++ b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/StackTraceSampleCoordinator.java @@ -49,8 +49,8 @@ import java.util.Timer; import java.util.TimerTask; import java.util.UUID; -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 coordinator for triggering and collecting stack traces of running tasks. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/WebRuntimeMonitor.java ---------------------------------------------------------------------- diff --git a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/WebRuntimeMonitor.java b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/WebRuntimeMonitor.java index b583ca5..66bcdf87 100644 --- a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/WebRuntimeMonitor.java +++ b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/WebRuntimeMonitor.java @@ -83,7 +83,7 @@ import java.util.concurrent.ForkJoinPool; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * The root component of the web runtime monitor. This class starts the web server and creates http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/files/StaticFileServerHandler.java ---------------------------------------------------------------------- diff --git a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/files/StaticFileServerHandler.java b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/files/StaticFileServerHandler.java index 4f2da30..d98471c 100644 --- a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/files/StaticFileServerHandler.java +++ b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/files/StaticFileServerHandler.java @@ -72,7 +72,6 @@ import java.util.GregorianCalendar; import java.util.Locale; import java.util.TimeZone; -import static com.google.common.base.Preconditions.checkNotNull; import static io.netty.handler.codec.http.HttpHeaders.Names.CACHE_CONTROL; import static io.netty.handler.codec.http.HttpHeaders.Names.CONNECTION; import static io.netty.handler.codec.http.HttpHeaders.Names.CONTENT_TYPE; @@ -85,6 +84,7 @@ import static io.netty.handler.codec.http.HttpResponseStatus.NOT_FOUND; import static io.netty.handler.codec.http.HttpResponseStatus.NOT_MODIFIED; import static io.netty.handler.codec.http.HttpResponseStatus.OK; import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * Simple file server handler that serves requests to web frontend's static files, such as http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/ClusterOverviewHandler.java ---------------------------------------------------------------------- diff --git a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/ClusterOverviewHandler.java b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/ClusterOverviewHandler.java index 2782ee4..b7389c4 100644 --- a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/ClusterOverviewHandler.java +++ b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/ClusterOverviewHandler.java @@ -30,7 +30,7 @@ import scala.concurrent.duration.FiniteDuration; import java.io.StringWriter; import java.util.Map; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * Responder that returns the status of the Flink cluster, such as how many http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/CurrentJobsOverviewHandler.java ---------------------------------------------------------------------- diff --git a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/CurrentJobsOverviewHandler.java b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/CurrentJobsOverviewHandler.java index e139c5c..571f911 100644 --- a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/CurrentJobsOverviewHandler.java +++ b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/CurrentJobsOverviewHandler.java @@ -31,7 +31,7 @@ import scala.concurrent.duration.FiniteDuration; import java.io.StringWriter; import java.util.Map; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * Request handler that returns a summary of the job status. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/HandlerRedirectUtils.java ---------------------------------------------------------------------- diff --git a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/HandlerRedirectUtils.java b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/HandlerRedirectUtils.java index 6c243ab..5db8505 100644 --- a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/HandlerRedirectUtils.java +++ b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/HandlerRedirectUtils.java @@ -37,7 +37,7 @@ import java.nio.charset.Charset; import java.util.regex.Matcher; import java.util.regex.Pattern; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * Utilities to extract a redirect address. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/JobVertexBackPressureHandler.java ---------------------------------------------------------------------- diff --git a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/JobVertexBackPressureHandler.java b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/JobVertexBackPressureHandler.java index 3ce6f02..65f82a3 100644 --- a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/JobVertexBackPressureHandler.java +++ b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/JobVertexBackPressureHandler.java @@ -28,8 +28,8 @@ import scala.Option; import java.io.StringWriter; import java.util.Map; -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; /** * Request handler that returns back pressure stats for a single job vertex and http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/TaskManagerLogHandler.java ---------------------------------------------------------------------- diff --git a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/TaskManagerLogHandler.java b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/TaskManagerLogHandler.java index 38957dc..5343049 100644 --- a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/TaskManagerLogHandler.java +++ b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/TaskManagerLogHandler.java @@ -71,11 +71,11 @@ import java.nio.channels.FileChannel; import java.util.HashMap; import java.util.concurrent.ConcurrentHashMap; -import static com.google.common.base.Preconditions.checkNotNull; import static io.netty.handler.codec.http.HttpHeaders.Names.CONNECTION; import static io.netty.handler.codec.http.HttpHeaders.Names.CONTENT_TYPE; import static io.netty.handler.codec.http.HttpResponseStatus.OK; import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * Request handler that returns the TaskManager log/out files. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobServer.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobServer.java b/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobServer.java index 8fcc024..2120b2f 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobServer.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobServer.java @@ -42,7 +42,7 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * This class implements the BLOB server. The BLOB server is responsible for listening for incoming requests and http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobUtils.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobUtils.java b/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobUtils.java index 830269d..6ba1944 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobUtils.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobUtils.java @@ -39,7 +39,7 @@ import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.UUID; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * Utility class to work with blob data. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/blob/FileSystemBlobStore.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/blob/FileSystemBlobStore.java b/flink-runtime/src/main/java/org/apache/flink/runtime/blob/FileSystemBlobStore.java index 5f65564..226b063 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/blob/FileSystemBlobStore.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/blob/FileSystemBlobStore.java @@ -36,7 +36,7 @@ import java.io.InputStream; import java.io.OutputStream; import java.net.URI; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * Blob store backed by {@link FileSystem}. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/broadcast/BroadcastVariableMaterialization.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/broadcast/BroadcastVariableMaterialization.java b/flink-runtime/src/main/java/org/apache/flink/runtime/broadcast/BroadcastVariableMaterialization.java index 8d3d609..cea32e5 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/broadcast/BroadcastVariableMaterialization.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/broadcast/BroadcastVariableMaterialization.java @@ -31,11 +31,10 @@ import org.apache.flink.runtime.io.network.api.reader.MutableReader; import org.apache.flink.runtime.operators.BatchTask; import org.apache.flink.runtime.operators.util.ReaderIterator; import org.apache.flink.runtime.plugable.DeserializationDelegate; +import org.apache.flink.util.Preconditions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Preconditions; - /** * @param <T> The type of the elements in the broadcasted data set. */ http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/CheckpointCoordinator.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/CheckpointCoordinator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/CheckpointCoordinator.java index 3b6f764..c599e5a 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/CheckpointCoordinator.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/CheckpointCoordinator.java @@ -55,8 +55,8 @@ import java.util.Timer; import java.util.TimerTask; import java.util.UUID; -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; /** * The checkpoint coordinator coordinates the distributed snapshots of operators and state. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/CheckpointCoordinatorDeActivator.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/CheckpointCoordinatorDeActivator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/CheckpointCoordinatorDeActivator.java index 8bdab7f..115d1db 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/CheckpointCoordinatorDeActivator.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/CheckpointCoordinatorDeActivator.java @@ -18,10 +18,10 @@ package org.apache.flink.runtime.checkpoint; -import com.google.common.base.Preconditions; import org.apache.flink.runtime.akka.FlinkUntypedActor; import org.apache.flink.runtime.jobgraph.JobStatus; import org.apache.flink.runtime.messages.ExecutionGraphMessages; +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/checkpoint/FileSystemStateStore.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/FileSystemStateStore.java b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/FileSystemStateStore.java index 73a094a..4ab0b54 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/FileSystemStateStore.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/FileSystemStateStore.java @@ -28,7 +28,7 @@ import java.io.IOException; import java.io.ObjectOutputStream; import java.io.Serializable; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * {@link FileSystem} backed {@link StateStore}. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/HeapStateStore.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/HeapStateStore.java b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/HeapStateStore.java index 60a092b..a0b3804 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/HeapStateStore.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/HeapStateStore.java @@ -24,7 +24,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicInteger; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * Java heap backed {@link StateStore}. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/SavepointCoordinator.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/SavepointCoordinator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/SavepointCoordinator.java index 034eefe..2c348ea 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/SavepointCoordinator.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/SavepointCoordinator.java @@ -44,7 +44,7 @@ import java.util.Set; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * The savepoint coordinator is a slightly modified variant of the regular http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/SavepointCoordinatorDeActivator.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/SavepointCoordinatorDeActivator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/SavepointCoordinatorDeActivator.java index 290091f..ca2b3ff 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/SavepointCoordinatorDeActivator.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/SavepointCoordinatorDeActivator.java @@ -18,10 +18,10 @@ package org.apache.flink.runtime.checkpoint; -import com.google.common.base.Preconditions; import org.apache.flink.runtime.akka.FlinkUntypedActor; import org.apache.flink.runtime.jobgraph.JobStatus; import org.apache.flink.runtime.messages.ExecutionGraphMessages; +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/checkpoint/StandaloneCompletedCheckpointStore.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/StandaloneCompletedCheckpointStore.java b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/StandaloneCompletedCheckpointStore.java index c31606a..c56f89e 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/StandaloneCompletedCheckpointStore.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/StandaloneCompletedCheckpointStore.java @@ -24,8 +24,8 @@ import java.util.ArrayDeque; import java.util.ArrayList; import java.util.List; -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; /** * {@link CompletedCheckpointStore} for JobManagers running in {@link RecoveryMode#STANDALONE}. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/SubtaskState.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/SubtaskState.java b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/SubtaskState.java index 2ad83b8..04ba8a5 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/SubtaskState.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/SubtaskState.java @@ -25,7 +25,7 @@ import org.slf4j.LoggerFactory; import java.io.Serializable; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * Simple bean to describe the state belonging to a parallel operator. It is part of the http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/ZooKeeperCheckpointIDCounter.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/ZooKeeperCheckpointIDCounter.java b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/ZooKeeperCheckpointIDCounter.java index cbdb9a2..6ce9672 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/ZooKeeperCheckpointIDCounter.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/ZooKeeperCheckpointIDCounter.java @@ -27,7 +27,7 @@ import org.apache.flink.runtime.jobmanager.RecoveryMode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * {@link CheckpointIDCounter} 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/checkpoint/ZooKeeperCheckpointRecoveryFactory.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/ZooKeeperCheckpointRecoveryFactory.java b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/ZooKeeperCheckpointRecoveryFactory.java index 2659e7e..f9d6d3e 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/ZooKeeperCheckpointRecoveryFactory.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/ZooKeeperCheckpointRecoveryFactory.java @@ -24,7 +24,7 @@ import org.apache.flink.configuration.Configuration; import org.apache.flink.runtime.jobmanager.RecoveryMode; import org.apache.flink.runtime.util.ZooKeeperUtils; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * {@link CheckpointCoordinator} components in {@link RecoveryMode#ZOOKEEPER}. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/ZooKeeperCompletedCheckpointStore.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/ZooKeeperCompletedCheckpointStore.java b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/ZooKeeperCompletedCheckpointStore.java index 65cdee7..f384e94 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/ZooKeeperCompletedCheckpointStore.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/ZooKeeperCompletedCheckpointStore.java @@ -36,8 +36,8 @@ import java.util.ArrayList; import java.util.ConcurrentModificationException; import java.util.List; -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; /** * {@link CompletedCheckpointStore} 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/checkpoint/stats/OperatorCheckpointStats.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/stats/OperatorCheckpointStats.java b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/stats/OperatorCheckpointStats.java index dde02e5..5b113d8 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/stats/OperatorCheckpointStats.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/stats/OperatorCheckpointStats.java @@ -20,7 +20,7 @@ package org.apache.flink.runtime.checkpoint.stats; import java.util.Arrays; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * Statistics for a specific checkpoint per operator. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/stats/SimpleCheckpointStatsTracker.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/stats/SimpleCheckpointStatsTracker.java b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/stats/SimpleCheckpointStatsTracker.java index a3d9a0e..19a8fe4 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/stats/SimpleCheckpointStatsTracker.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/stats/SimpleCheckpointStatsTracker.java @@ -31,7 +31,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static com.google.common.base.Preconditions.checkArgument; +import static org.apache.flink.util.Preconditions.checkArgument; /** * A simple checkpoint stats tracker. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/client/JobClient.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/client/JobClient.java b/flink-runtime/src/main/java/org/apache/flink/runtime/client/JobClient.java index 60d942b..cb95040 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/client/JobClient.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/client/JobClient.java @@ -54,7 +54,7 @@ import java.net.InetAddress; import java.net.InetSocketAddress; import java.util.concurrent.TimeoutException; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * The JobClient bridges between the JobManager's asynchronous actor messages and http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/client/JobClientActor.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/client/JobClientActor.java b/flink-runtime/src/main/java/org/apache/flink/runtime/client/JobClientActor.java index 5cdd468..f2a2e1b 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/client/JobClientActor.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/client/JobClientActor.java @@ -25,7 +25,6 @@ import akka.actor.Status; import akka.actor.Terminated; import akka.dispatch.Futures; import akka.dispatch.OnSuccess; -import com.google.common.base.Preconditions; import org.apache.flink.runtime.akka.AkkaUtils; import org.apache.flink.runtime.akka.FlinkUntypedActor; import org.apache.flink.runtime.akka.ListeningBehaviour; @@ -42,6 +41,7 @@ import org.apache.flink.runtime.messages.JobClientMessages.JobManagerLeaderAddre import org.apache.flink.runtime.messages.JobClientMessages.SubmitJobAndWait; import org.apache.flink.runtime.messages.JobManagerMessages; import org.apache.flink.runtime.util.SerializedThrowable; +import org.apache.flink.util.Preconditions; import scala.concurrent.duration.FiniteDuration; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/clusterframework/FlinkResourceManager.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/clusterframework/FlinkResourceManager.java b/flink-runtime/src/main/java/org/apache/flink/runtime/clusterframework/FlinkResourceManager.java index d4945b4..1bcb195 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/clusterframework/FlinkResourceManager.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/clusterframework/FlinkResourceManager.java @@ -26,7 +26,6 @@ import akka.dispatch.OnComplete; import akka.pattern.Patterns; import akka.util.Timeout; -import com.google.common.base.Preconditions; import org.apache.flink.configuration.ConfigConstants; import org.apache.flink.configuration.Configuration; import org.apache.flink.runtime.akka.AkkaUtils; @@ -56,6 +55,7 @@ import org.apache.flink.runtime.messages.JobManagerMessages.LeaderSessionMessage import org.apache.flink.runtime.messages.RegistrationMessages; import org.apache.flink.util.ExceptionUtils; +import org.apache.flink.util.Preconditions; import scala.concurrent.Future; import scala.concurrent.duration.Duration; http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/clusterframework/messages/ReconnectResourceManager.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/clusterframework/messages/ReconnectResourceManager.java b/flink-runtime/src/main/java/org/apache/flink/runtime/clusterframework/messages/ReconnectResourceManager.java index cd85b5e..6f6f878 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/clusterframework/messages/ReconnectResourceManager.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/clusterframework/messages/ReconnectResourceManager.java @@ -19,8 +19,8 @@ package org.apache.flink.runtime.clusterframework.messages; import akka.actor.ActorRef; -import com.google.common.base.Preconditions; import org.apache.flink.runtime.messages.RequiresLeaderSessionID; +import org.apache.flink.util.Preconditions; /** * This message signals that the ResourceManager should reconnect to the JobManager. It is processed http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/clusterframework/messages/RegisterResourceManager.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/clusterframework/messages/RegisterResourceManager.java b/flink-runtime/src/main/java/org/apache/flink/runtime/clusterframework/messages/RegisterResourceManager.java index c289805..fce2b87 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/clusterframework/messages/RegisterResourceManager.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/clusterframework/messages/RegisterResourceManager.java @@ -19,8 +19,8 @@ package org.apache.flink.runtime.clusterframework.messages; import akka.actor.ActorRef; -import com.google.common.base.Preconditions; import org.apache.flink.runtime.messages.RequiresLeaderSessionID; +import org.apache.flink.util.Preconditions; /** * This message signals that the resource manager wants to register at the JobManager leader. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/deployment/InputChannelDeploymentDescriptor.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/deployment/InputChannelDeploymentDescriptor.java b/flink-runtime/src/main/java/org/apache/flink/runtime/deployment/InputChannelDeploymentDescriptor.java index 7592231..e00a480 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/deployment/InputChannelDeploymentDescriptor.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/deployment/InputChannelDeploymentDescriptor.java @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; import java.io.Serializable; import java.util.Arrays; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * Deployment descriptor for a single input channel instance. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/deployment/InputGateDeploymentDescriptor.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/deployment/InputGateDeploymentDescriptor.java b/flink-runtime/src/main/java/org/apache/flink/runtime/deployment/InputGateDeploymentDescriptor.java index 8a753c5..ec4bd40 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/deployment/InputGateDeploymentDescriptor.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/deployment/InputGateDeploymentDescriptor.java @@ -25,8 +25,8 @@ import org.apache.flink.runtime.jobgraph.IntermediateDataSetID; import java.io.Serializable; 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.util.Preconditions.checkArgument; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * Deployment descriptor for a single input gate instance. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/deployment/PartialInputChannelDeploymentDescriptor.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/deployment/PartialInputChannelDeploymentDescriptor.java b/flink-runtime/src/main/java/org/apache/flink/runtime/deployment/PartialInputChannelDeploymentDescriptor.java index adea18d..a3cfcd9 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/deployment/PartialInputChannelDeploymentDescriptor.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/deployment/PartialInputChannelDeploymentDescriptor.java @@ -26,7 +26,7 @@ import org.apache.flink.runtime.io.network.ConnectionID; import org.apache.flink.runtime.io.network.partition.ResultPartitionID; import org.apache.flink.runtime.jobgraph.IntermediateDataSetID; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * Partial deployment descriptor for a single input channel instance. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/deployment/ResultPartitionDeploymentDescriptor.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/deployment/ResultPartitionDeploymentDescriptor.java b/flink-runtime/src/main/java/org/apache/flink/runtime/deployment/ResultPartitionDeploymentDescriptor.java index eadcd1c..e72d468 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/deployment/ResultPartitionDeploymentDescriptor.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/deployment/ResultPartitionDeploymentDescriptor.java @@ -26,8 +26,8 @@ import org.apache.flink.runtime.jobgraph.IntermediateResultPartitionID; import java.io.Serializable; -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; /** * Deployment descriptor for a result partition. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/deployment/ResultPartitionLocation.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/deployment/ResultPartitionLocation.java b/flink-runtime/src/main/java/org/apache/flink/runtime/deployment/ResultPartitionLocation.java index 3922c22..ca63e6b 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/deployment/ResultPartitionLocation.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/deployment/ResultPartitionLocation.java @@ -22,7 +22,7 @@ import org.apache.flink.runtime.io.network.ConnectionID; import java.io.Serializable; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * Location of a result partition from the perspective of the consuming task. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/deployment/TaskDeploymentDescriptor.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/deployment/TaskDeploymentDescriptor.java b/flink-runtime/src/main/java/org/apache/flink/runtime/deployment/TaskDeploymentDescriptor.java index d3ebc95..f595681 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/deployment/TaskDeploymentDescriptor.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/deployment/TaskDeploymentDescriptor.java @@ -33,8 +33,8 @@ import java.net.URL; import java.util.Collection; import java.util.List; -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 task deployment descriptor contains all the information necessary to deploy a task on a task manager. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/execution/librarycache/BlobLibraryCacheManager.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/execution/librarycache/BlobLibraryCacheManager.java b/flink-runtime/src/main/java/org/apache/flink/runtime/execution/librarycache/BlobLibraryCacheManager.java index fcffd39..12be6f4 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/execution/librarycache/BlobLibraryCacheManager.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/execution/librarycache/BlobLibraryCacheManager.java @@ -37,11 +37,11 @@ import org.apache.flink.runtime.blob.BlobService; import org.apache.flink.runtime.executiongraph.ExecutionAttemptID; import org.apache.flink.api.common.JobID; import org.apache.flink.util.ExceptionUtils; +import org.apache.flink.util.Preconditions; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Preconditions; - /** * For each job graph that is submitted to the system the library cache manager maintains * a set of libraries (typically JAR files) which the job requires to run. The library cache manager http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/Execution.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/Execution.java b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/Execution.java index 4ba58d3..691adaf 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/Execution.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/Execution.java @@ -66,7 +66,6 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; import static akka.dispatch.Futures.future; -import static com.google.common.base.Preconditions.checkNotNull; import static org.apache.flink.runtime.execution.ExecutionState.CANCELED; import static org.apache.flink.runtime.execution.ExecutionState.CANCELING; import static org.apache.flink.runtime.execution.ExecutionState.CREATED; @@ -82,6 +81,7 @@ import static org.apache.flink.runtime.messages.TaskMessages.SubmitTask; import static org.apache.flink.runtime.messages.TaskMessages.UpdatePartitionInfo; import static org.apache.flink.runtime.messages.TaskMessages.UpdateTaskSinglePartitionInfo; import static org.apache.flink.runtime.messages.TaskMessages.createUpdateTaskMultiplePartitionInfos; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * A single execution of a vertex. While an {@link ExecutionVertex} can be executed multiple times (for recovery, http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGraph.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGraph.java b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGraph.java index d19f25d..3a2dbef 100755 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGraph.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGraph.java @@ -80,7 +80,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * The execution graph is the central data structure that coordinates the distributed * execution of a data flow. It keeps representations of each parallel task, each http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/IntermediateResult.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/IntermediateResult.java b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/IntermediateResult.java index 59c70cb..9d57014 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/IntermediateResult.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/IntermediateResult.java @@ -23,8 +23,8 @@ import org.apache.flink.runtime.jobgraph.IntermediateDataSetID; 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 IntermediateResult { http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/restart/FixedDelayRestartStrategy.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/restart/FixedDelayRestartStrategy.java b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/restart/FixedDelayRestartStrategy.java index 464b48e..3406f4e 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/restart/FixedDelayRestartStrategy.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/restart/FixedDelayRestartStrategy.java @@ -18,10 +18,10 @@ package org.apache.flink.runtime.executiongraph.restart; -import com.google.common.base.Preconditions; import org.apache.flink.configuration.ConfigConstants; import org.apache.flink.configuration.Configuration; import org.apache.flink.runtime.executiongraph.ExecutionGraph; +import org.apache.flink.util.Preconditions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import scala.concurrent.duration.Duration; http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/FileChannelInputView.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/FileChannelInputView.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/FileChannelInputView.java index 992631b..648a72c 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/FileChannelInputView.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/FileChannelInputView.java @@ -18,9 +18,6 @@ package org.apache.flink.runtime.io.disk; -import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.common.base.Preconditions.checkArgument; - import java.io.EOFException; import java.io.IOException; import java.util.List; @@ -31,6 +28,9 @@ import org.apache.flink.runtime.memory.AbstractPagedInputView; import org.apache.flink.runtime.memory.MemoryManager; import org.apache.flink.util.MathUtils; +import static org.apache.flink.util.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkArgument; + /** * A {@link org.apache.flink.core.memory.DataInputView} that is backed by a {@link BlockChannelReader}, * making it effectively a data input stream. The view reads it data in blocks from the underlying channel. @@ -145,4 +145,4 @@ public class FileChannelInputView extends AbstractPagedInputView { memManager.release(seg); } } -} \ 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/io/disk/FileChannelOutputView.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/FileChannelOutputView.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/FileChannelOutputView.java index 8415d09..abcb398 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/FileChannelOutputView.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/FileChannelOutputView.java @@ -18,9 +18,6 @@ package org.apache.flink.runtime.io.disk; -import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.base.Preconditions.checkNotNull; - import java.io.IOException; import java.util.List; @@ -29,6 +26,9 @@ import org.apache.flink.runtime.io.disk.iomanager.BlockChannelWriter; import org.apache.flink.runtime.memory.AbstractPagedOutputView; import org.apache.flink.runtime.memory.MemoryManager; +import static org.apache.flink.util.Preconditions.checkArgument; +import static org.apache.flink.util.Preconditions.checkNotNull; + /** * A {@link org.apache.flink.core.memory.DataOutputView} that is backed by a {@link BlockChannelWriter}, making it effectively a data output * stream. The view writes it data in blocks to the underlying channel. @@ -145,4 +145,4 @@ public class FileChannelOutputView extends AbstractPagedOutputView { numBlocksWritten++; bytesInLatestSegment = writePosition; } -} \ 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/io/disk/SeekableFileChannelInputView.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/SeekableFileChannelInputView.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/SeekableFileChannelInputView.java index e768c77..10a7364 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/SeekableFileChannelInputView.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/SeekableFileChannelInputView.java @@ -18,8 +18,6 @@ package org.apache.flink.runtime.io.disk; -import static com.google.common.base.Preconditions.checkNotNull; - import java.io.EOFException; import java.io.IOException; import java.util.List; @@ -32,6 +30,8 @@ import org.apache.flink.runtime.memory.AbstractPagedInputView; import org.apache.flink.runtime.memory.MemoryManager; import org.apache.flink.util.MathUtils; +import static org.apache.flink.util.Preconditions.checkNotNull; + /** * A {@link org.apache.flink.core.memory.DataInputView} that is backed by a {@link BlockChannelReader}, * making it effectively a data input stream. The view reads it data in blocks from the underlying channel. @@ -183,4 +183,4 @@ public class SeekableFileChannelInputView extends AbstractPagedInputView { numRequestsRemaining--; } } -} \ 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/io/disk/iomanager/AbstractFileIOChannel.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/AbstractFileIOChannel.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/AbstractFileIOChannel.java index e79439f..51f9bb3 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/AbstractFileIOChannel.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/AbstractFileIOChannel.java @@ -26,7 +26,7 @@ import java.nio.channels.FileChannel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Preconditions; +import org.apache.flink.util.Preconditions; public abstract class AbstractFileIOChannel implements FileIOChannel { @@ -109,4 +109,4 @@ public abstract class AbstractFileIOChannel implements FileIOChannel { public FileChannel getNioFileChannel() { return fileChannel; } -} \ 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/io/disk/iomanager/AsynchronousFileIOChannel.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/AsynchronousFileIOChannel.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/AsynchronousFileIOChannel.java index a41be64..61a934a 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/AsynchronousFileIOChannel.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/AsynchronousFileIOChannel.java @@ -28,7 +28,7 @@ import java.nio.channels.FileChannel; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * A base class for readers and writers that accept read or write requests for whole blocks. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/IOManagerAsync.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/IOManagerAsync.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/IOManagerAsync.java index 0db4ac6..e2a3a6f 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/IOManagerAsync.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/IOManagerAsync.java @@ -28,7 +28,7 @@ import java.util.List; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.atomic.AtomicBoolean; -import static com.google.common.base.Preconditions.checkState; +import static org.apache.flink.util.Preconditions.checkState; /** * A version of the {@link IOManager} that uses asynchronous I/O. @@ -520,4 +520,4 @@ public class IOManagerAsync extends IOManager implements UncaughtExceptionHandle } }; // end writer thread -} \ 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/io/network/ConnectionID.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/ConnectionID.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/ConnectionID.java index 5a31c3f..c15e72e 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/ConnectionID.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/ConnectionID.java @@ -24,8 +24,8 @@ import org.apache.flink.runtime.instance.InstanceConnectionInfo; import java.io.Serializable; import java.net.InetSocketAddress; -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 ConnectionID} identifies a connection to a remote task manager by the socket address and http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/NetworkEnvironment.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/NetworkEnvironment.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/NetworkEnvironment.java index 10fcc63..30d2e38 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/NetworkEnvironment.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/NetworkEnvironment.java @@ -50,8 +50,8 @@ import scala.concurrent.duration.FiniteDuration; import java.io.IOException; -import static com.google.common.base.Preconditions.checkNotNull; import static org.apache.flink.runtime.messages.JobManagerMessages.ScheduleOrUpdateConsumers; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * Network I/O components of each {@link TaskManager} instance. The network environment contains http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/reader/AbstractReader.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/reader/AbstractReader.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/reader/AbstractReader.java index 84189be..3a343bf 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/reader/AbstractReader.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/reader/AbstractReader.java @@ -28,7 +28,7 @@ import org.apache.flink.runtime.util.event.EventListener; import java.io.IOException; -import static com.google.common.base.Preconditions.checkState; +import static org.apache.flink.util.Preconditions.checkState; /** * A basic reader implementation, which wraps an input gate and handles events. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/buffer/Buffer.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/buffer/Buffer.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/buffer/Buffer.java index 5fb62cb..dbdf17f 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/buffer/Buffer.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/buffer/Buffer.java @@ -22,8 +22,8 @@ import org.apache.flink.core.memory.MemorySegment; import java.nio.ByteBuffer; -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; /** * Wrapper for pooled {@link MemorySegment} instances. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/buffer/LocalBufferPool.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/buffer/LocalBufferPool.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/buffer/LocalBufferPool.java index 4cb1521..4a541e4 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/buffer/LocalBufferPool.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/buffer/LocalBufferPool.java @@ -25,9 +25,9 @@ import java.io.IOException; import java.util.ArrayDeque; import java.util.Queue; -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; /** * A buffer pool used to manage a number of {@link Buffer} instances from the http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/buffer/NetworkBufferPool.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/buffer/NetworkBufferPool.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/buffer/NetworkBufferPool.java index 641d13e..dc23341 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/buffer/NetworkBufferPool.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/buffer/NetworkBufferPool.java @@ -32,7 +32,7 @@ import java.util.Queue; import java.util.Set; import java.util.concurrent.ArrayBlockingQueue; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * The NetworkBufferPool is a fixed size pool of {@link MemorySegment} instances http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/NettyBufferPool.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/NettyBufferPool.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/NettyBufferPool.java index b2c2063..6d09f26 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/NettyBufferPool.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/NettyBufferPool.java @@ -29,7 +29,7 @@ import scala.Option; import java.lang.reflect.Field; -import static com.google.common.base.Preconditions.checkArgument; +import static org.apache.flink.util.Preconditions.checkArgument; /** * Wrapper around Netty's {@link PooledByteBufAllocator} with strict control http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/NettyClient.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/NettyClient.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/NettyClient.java index 5fd04de..7e80fb8 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/NettyClient.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/NettyClient.java @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; import java.io.IOException; import java.net.SocketAddress; -import static com.google.common.base.Preconditions.checkState; +import static org.apache.flink.util.Preconditions.checkState; class NettyClient { http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/NettyConfig.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/NettyConfig.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/NettyConfig.java index 0c52e02..6806136 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/NettyConfig.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/NettyConfig.java @@ -24,8 +24,8 @@ import org.slf4j.LoggerFactory; import java.net.InetAddress; -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 NettyConfig { http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/NettyServer.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/NettyServer.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/NettyServer.java index 4436caf..036fe22 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/NettyServer.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/NettyServer.java @@ -35,8 +35,8 @@ import org.slf4j.LoggerFactory; import java.io.IOException; import java.util.concurrent.ThreadFactory; -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; class NettyServer { http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/PartitionRequestClient.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/PartitionRequestClient.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/PartitionRequestClient.java index f6120d4..7c06b55 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/PartitionRequestClient.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/PartitionRequestClient.java @@ -33,9 +33,9 @@ import org.slf4j.LoggerFactory; import java.io.IOException; import java.util.concurrent.TimeUnit; -import static com.google.common.base.Preconditions.checkNotNull; import static org.apache.flink.runtime.io.network.netty.NettyMessage.PartitionRequest; import static org.apache.flink.runtime.io.network.netty.NettyMessage.TaskEventRequest; +import static org.apache.flink.util.Preconditions.checkNotNull; /** * Partition request client for remote partition requests. http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/PartitionRequestClientHandler.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/PartitionRequestClientHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/PartitionRequestClientHandler.java index ee015c2..953405f 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/PartitionRequestClientHandler.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/PartitionRequestClientHandler.java @@ -46,7 +46,7 @@ import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; -import static com.google.common.base.Preconditions.checkState; +import static org.apache.flink.util.Preconditions.checkState; class PartitionRequestClientHandler extends ChannelInboundHandlerAdapter { http://git-wip-us.apache.org/repos/asf/flink/blob/c4bbed9e/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/PartitionRequestQueue.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/PartitionRequestQueue.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/PartitionRequestQueue.java index bb8c851..094c9c7 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/PartitionRequestQueue.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/PartitionRequestQueue.java @@ -39,7 +39,7 @@ import java.util.ArrayDeque; import java.util.Queue; import java.util.Set; -import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.flink.util.Preconditions.checkNotNull; import static org.apache.flink.runtime.io.network.netty.NettyMessage.BufferResponse; /**