Repository: tinkerpop Updated Branches: refs/heads/master 2bd3c532c -> 10f0d4089
Added integer IdManager to TheCrew on creation CTR Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/3c77afb4 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/3c77afb4 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/3c77afb4 Branch: refs/heads/master Commit: 3c77afb46e39e95b400189591902189c548920b2 Parents: bb2d180 Author: Stephen Mallette <[email protected]> Authored: Fri Jun 2 21:39:02 2017 -0400 Committer: Stephen Mallette <[email protected]> Committed: Fri Jun 2 21:39:02 2017 -0400 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 2 +- .../tinkergraph/structure/TinkerFactory.java | 23 +++++++++----------- 2 files changed, 11 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3c77afb4/CHANGELOG.asciidoc ---------------------------------------------------------------------- diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 7da968e..3a70f4c 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -26,7 +26,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima TinkerPop 3.1.7 (Release Date: NOT OFFICIALLY RELEASED YET) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -* Configured Modern graph to work with a integer `IdManager` when `TinkerFactory.createModern()` is called. +* Configured Modern and The Crew graphs to work with a integer `IdManager` when `TinkerFactory.createXXX()` is called. * Added XSLT transform option to convert TinkerPop 2.x GraphML to 3.x GraphML. * Added validation to `StarVertexProperty`. * Bumped to Jackson 2.8.7. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3c77afb4/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerFactory.java ---------------------------------------------------------------------- diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerFactory.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerFactory.java index 4c38070..71d1cc2 100644 --- a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerFactory.java +++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerFactory.java @@ -21,13 +21,6 @@ package org.apache.tinkerpop.gremlin.tinkergraph.structure; import org.apache.commons.configuration.BaseConfiguration; import org.apache.commons.configuration.Configuration; import org.apache.tinkerpop.gremlin.structure.T; -import org.apache.tinkerpop.gremlin.process.traversal.Traversal; -import org.apache.tinkerpop.gremlin.process.traversal.step.map.LambdaFlatMapStep; -import org.apache.tinkerpop.gremlin.process.traversal.step.map.LambdaMapStep; -import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.StartStep; -import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversal; -import org.apache.tinkerpop.gremlin.structure.Direction; -import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.apache.tinkerpop.gremlin.structure.VertexProperty; @@ -40,7 +33,7 @@ public final class TinkerFactory { private TinkerFactory() {} public static TinkerGraph createClassic() { - final TinkerGraph g = getTinkerGraphWithIntegerManager(); + final TinkerGraph g = getTinkerGraphWithIntManager(); generateClassic(g); return g; } @@ -61,7 +54,7 @@ public final class TinkerFactory { } public static TinkerGraph createModern() { - final TinkerGraph g = getTinkerGraphWithIntegerManager(); + final TinkerGraph g = getTinkerGraphWithIntManager(); generateModern(g); return g; } @@ -82,7 +75,7 @@ public final class TinkerFactory { } public static TinkerGraph createTheCrew() { - final Configuration conf = new BaseConfiguration(); + final Configuration conf = getIntIdManagerConfiguration(); conf.setProperty(TinkerGraph.GREMLIN_TINKERGRAPH_DEFAULT_VERTEX_PROPERTY_CARDINALITY, VertexProperty.Cardinality.list.name()); final TinkerGraph g = TinkerGraph.open(conf); generateTheCrew(g); @@ -139,12 +132,16 @@ public final class TinkerFactory { g.variables().set("comment", "this graph was created to provide examples and test coverage for tinkerpop3 api advances"); } - private static TinkerGraph getTinkerGraphWithIntegerManager() { + private static TinkerGraph getTinkerGraphWithIntManager() { + final Configuration conf = getIntIdManagerConfiguration(); + return TinkerGraph.open(conf); + } + + private static Configuration getIntIdManagerConfiguration() { final Configuration conf = new BaseConfiguration(); conf.setProperty(TinkerGraph.GREMLIN_TINKERGRAPH_VERTEX_ID_MANAGER, TinkerGraph.DefaultIdManager.INTEGER.name()); conf.setProperty(TinkerGraph.GREMLIN_TINKERGRAPH_EDGE_ID_MANAGER, TinkerGraph.DefaultIdManager.INTEGER.name()); conf.setProperty(TinkerGraph.GREMLIN_TINKERGRAPH_VERTEX_PROPERTY_ID_MANAGER, TinkerGraph.DefaultIdManager.INTEGER.name()); - - return TinkerGraph.open(conf); + return conf; } }
