You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2015/04/24 17:06:40 UTC

incubator-tinkerpop git commit: Remove some builder settings that were used with BatchGraph.

Repository: incubator-tinkerpop
Updated Branches:
  refs/heads/refactor-io f5d5fcb14 -> ef68e2626


Remove some builder settings that were used with BatchGraph.


Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/ef68e262
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/ef68e262
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/ef68e262

Branch: refs/heads/refactor-io
Commit: ef68e26266e5c4d1dc8301e0b723eac246c5b2b9
Parents: f5d5fcb
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Apr 24 11:06:14 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Apr 24 11:06:14 2015 -0400

----------------------------------------------------------------------
 .../gremlin/structure/io/gryo/GryoReader.java   | 33 ++------------------
 1 file changed, 2 insertions(+), 31 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ef68e262/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoReader.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoReader.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoReader.java
index ec9e512..9c7eca0 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoReader.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoReader.java
@@ -38,7 +38,6 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Function;
 
@@ -56,15 +55,9 @@ public class GryoReader implements GraphReader {
     private final Kryo kryo;
 
     private final long batchSize;
-    private final String vertexIdKey;
-    private final String edgeIdKey;
 
-    private GryoReader(final long batchSize,
-                       final String vertexIdKey, final String edgeIdKey,
-                       final GryoMapper gryoMapper) {
+    private GryoReader(final long batchSize, final GryoMapper gryoMapper) {
         this.kryo = gryoMapper.createMapper();
-        this.vertexIdKey = vertexIdKey;
-        this.edgeIdKey = edgeIdKey;
         this.batchSize = batchSize;
     }
 
@@ -146,8 +139,6 @@ public class GryoReader implements GraphReader {
     public static class Builder implements ReaderBuilder<GryoReader> {
 
         private long batchSize = BatchGraph.DEFAULT_BUFFER_SIZE;
-        private String vertexIdKey = T.id.getAccessor();
-        private String edgeIdKey = T.id.getAccessor();
         /**
          * Always use the most recent gryo version by default
          */
@@ -173,28 +164,8 @@ public class GryoReader implements GraphReader {
             return this;
         }
 
-        /**
-         * The name of the key to supply to
-         * {@link org.apache.tinkerpop.gremlin.structure.util.batch.BatchGraph.Builder#vertexIdKey} when reading data into
-         * the {@link Graph}.
-         */
-        public Builder vertexIdKey(final String vertexIdKey) {
-            this.vertexIdKey = vertexIdKey;
-            return this;
-        }
-
-        /**
-         * The name of the key to supply to
-         * {@link org.apache.tinkerpop.gremlin.structure.util.batch.BatchGraph.Builder#edgeIdKey} when reading data into
-         * the {@link Graph}.
-         */
-        public Builder edgeIdKey(final String edgeIdKey) {
-            this.edgeIdKey = edgeIdKey;
-            return this;
-        }
-
         public GryoReader create() {
-            return new GryoReader(batchSize, this.vertexIdKey, this.edgeIdKey, this.gryoMapper);
+            return new GryoReader(batchSize, this.gryoMapper);
         }
 
     }