You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2016/04/27 11:25:17 UTC
[4/5] flink git commit: [FLINK-3815] Replace Guava Preconditions
usage in flink-gelly
[FLINK-3815] Replace Guava Preconditions usage in flink-gelly
This closes #1932
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/eed6f0f7
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/eed6f0f7
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/eed6f0f7
Branch: refs/heads/master
Commit: eed6f0f7e9d6521755d870bcb73fae282b958e2c
Parents: 6ef08cf
Author: zentol <ch...@apache.org>
Authored: Tue Apr 26 13:10:17 2016 +0200
Committer: zentol <ch...@apache.org>
Committed: Wed Apr 27 11:24:27 2016 +0200
----------------------------------------------------------------------
flink-libraries/flink-gelly/pom.xml | 5 -----
.../src/main/java/org/apache/flink/graph/GraphCsvReader.java | 4 ++--
.../java/org/apache/flink/graph/IterationConfiguration.java | 2 +-
.../org/apache/flink/graph/gsa/GatherSumApplyIteration.java | 4 ++--
.../org/apache/flink/graph/pregel/VertexCentricIteration.java | 5 ++---
.../org/apache/flink/graph/spargel/ScatterGatherIteration.java | 3 +--
6 files changed, 8 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/eed6f0f7/flink-libraries/flink-gelly/pom.xml
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly/pom.xml b/flink-libraries/flink-gelly/pom.xml
index e8995c7..e6a7ef6 100644
--- a/flink-libraries/flink-gelly/pom.xml
+++ b/flink-libraries/flink-gelly/pom.xml
@@ -60,10 +60,5 @@ under the License.
<type>test-jar</type>
<scope>test</scope>
</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/eed6f0f7/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/GraphCsvReader.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/GraphCsvReader.java b/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/GraphCsvReader.java
index a8c50bb..f93abc4 100644
--- a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/GraphCsvReader.java
+++ b/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/GraphCsvReader.java
@@ -17,7 +17,6 @@
*/
package org.apache.flink.graph;
-import com.google.common.base.Preconditions;
import org.apache.flink.api.common.functions.MapFunction;
import org.apache.flink.api.java.DataSet;
@@ -27,6 +26,7 @@ import org.apache.flink.api.java.tuple.Tuple3;
import org.apache.flink.core.fs.Path;
import org.apache.flink.types.NullValue;
import org.apache.flink.api.java.ExecutionEnvironment;
+import org.apache.flink.util.Preconditions;
/**
* A class to build a Graph using path(s) provided to CSV file(s) with optional vertex and edge data.
@@ -484,4 +484,4 @@ public class GraphCsvReader {
}
return this;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/flink/blob/eed6f0f7/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/IterationConfiguration.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/IterationConfiguration.java b/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/IterationConfiguration.java
index 3215194..7578420 100644
--- a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/IterationConfiguration.java
+++ b/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/IterationConfiguration.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.flink.api.common.aggregators.Aggregator;
-import com.google.common.base.Preconditions;
+import org.apache.flink.util.Preconditions;
/**
* This is used as a base class for vertex-centric iteration or gather-sum-apply iteration configuration.
http://git-wip-us.apache.org/repos/asf/flink/blob/eed6f0f7/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/gsa/GatherSumApplyIteration.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/gsa/GatherSumApplyIteration.java b/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/gsa/GatherSumApplyIteration.java
index a68b5c8..d092086 100755
--- a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/gsa/GatherSumApplyIteration.java
+++ b/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/gsa/GatherSumApplyIteration.java
@@ -42,9 +42,9 @@ import org.apache.flink.graph.EdgeDirection;
import org.apache.flink.graph.Graph;
import org.apache.flink.graph.Vertex;
import org.apache.flink.util.Collector;
-import java.util.Map;
+import org.apache.flink.util.Preconditions;
-import com.google.common.base.Preconditions;
+import java.util.Map;
/**
* This class represents iterative graph computations, programmed in a gather-sum-apply perspective.
http://git-wip-us.apache.org/repos/asf/flink/blob/eed6f0f7/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/pregel/VertexCentricIteration.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/pregel/VertexCentricIteration.java b/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/pregel/VertexCentricIteration.java
index 9434221..8d96776 100644
--- a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/pregel/VertexCentricIteration.java
+++ b/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/pregel/VertexCentricIteration.java
@@ -48,8 +48,7 @@ import org.apache.flink.graph.Vertex;
import org.apache.flink.types.Either;
import org.apache.flink.types.NullValue;
import org.apache.flink.util.Collector;
-
-import com.google.common.base.Preconditions;
+import org.apache.flink.util.Preconditions;
/**
* This class represents iterative graph computations, programmed in a vertex-centric perspective.
@@ -513,4 +512,4 @@ public class VertexCentricIteration<K, VV, EV, Message>
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/flink/blob/eed6f0f7/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/spargel/ScatterGatherIteration.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/spargel/ScatterGatherIteration.java b/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/spargel/ScatterGatherIteration.java
index 8023eea..496e36d 100644
--- a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/spargel/ScatterGatherIteration.java
+++ b/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/spargel/ScatterGatherIteration.java
@@ -41,8 +41,7 @@ import org.apache.flink.graph.EdgeDirection;
import org.apache.flink.graph.Graph;
import org.apache.flink.graph.Vertex;
import org.apache.flink.util.Collector;
-
-import com.google.common.base.Preconditions;
+import org.apache.flink.util.Preconditions;
/**
* This class represents iterative graph computations, programmed in a scatter-gather perspective.