Remove CreateTx* methods from TinkerFactory CTR.

Author: kenhuuu

tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerFactory.java

@@ -51,17 +51,6 @@ public static TinkerGraph createClassic() {
         return g;
     }
 
-    /**
-     * Create the "classic" graph with transaction support.
-     * @see #createClassic()
-     */
-    public static TinkerTransactionGraph createTxClassic() {
-        final TinkerTransactionGraph g = getTinkerTransactionGraphWithClassicNumberManager();
-        generateClassic(g);
-        g.tx().commit();
-        return g;
-    }
-
     /**
      * Generate the graph in {@link #createClassic()} into an existing graph.
      */
@@ -90,17 +79,6 @@ public static TinkerGraph createModern() {
         return g;
     }
 
-    /**
-     * Create the "modern" graph with transaction support.
-     * @see #createModern()
-     */
-    public static TinkerTransactionGraph createTxModern() {
-        final TinkerTransactionGraph g = getTinkerTransactionGraphWithCurrentNumberManager();
-        generateModern(g);
-        g.tx().commit();
-        return g;
-    }
-
     /**
      * Generate the graph in {@link #createModern()} into an existing graph.
      */
@@ -144,19 +122,6 @@ public static TinkerGraph createTheCrew() {
         return g;
     }
 
-    /**
-     * Create the "the crew" graph with transaction support.
-     * @see #createTheCrew()
-     */
-    public static TinkerTransactionGraph createTxTheCrew() {
-        final Configuration conf = getConfigurationWithCurrentNumberManager();
-        conf.setProperty(TinkerGraph.GREMLIN_TINKERGRAPH_DEFAULT_VERTEX_PROPERTY_CARDINALITY, VertexProperty.Cardinality.list.name());
-        final TinkerTransactionGraph g = TinkerTransactionGraph.open(conf);
-        generateTheCrew(g);
-        g.tx().commit();
-        return g;
-    }
-
     /**
      * Generate the graph in {@link #createTheCrew()} into an existing graph.
      */
@@ -220,17 +185,6 @@ public static TinkerGraph createKitchenSink() {
         return g;
     }
 
-    /**
-     * Creates the "kitchen sink" graph with transaction support.
-     * @see #createKitchenSink()
-     */
-    public static TinkerTransactionGraph createTxKitchenSink() {
-        final TinkerTransactionGraph g = getTinkerTransactionGraphWithCurrentNumberManager();
-        generateKitchenSink(g);
-        g.tx().commit();
-        return g;
-    }
-
     /**
      * Generate the graph in {@link #createKitchenSink()} into an existing graph.
      */
@@ -255,17 +209,6 @@ public static TinkerGraph createGratefulDead() {
         return g;
     }
 
-    /**
-     * Creates the "grateful dead" graph with transaction support.
-     * @see #createGratefulDead()
-     */
-    public static TinkerTransactionGraph createTxGratefulDead() {
-        final TinkerTransactionGraph g = getTinkerTransactionGraphWithCurrentNumberManager();
-        generateGratefulDead(g);
-        g.tx().commit();
-        return g;
-    }
-
     /**
      * Generate the graph in {@link #createGratefulDead()} into an existing graph.
      */
@@ -282,10 +225,6 @@ private static TinkerGraph getTinkerGraphWithCurrentNumberManager() {
         return TinkerGraph.open(getConfigurationWithCurrentNumberManager());
     }
 
-    private static TinkerTransactionGraph getTinkerTransactionGraphWithCurrentNumberManager() {
-        return TinkerTransactionGraph.open(getConfigurationWithCurrentNumberManager());
-    }
-
     private static Configuration getConfigurationWithCurrentNumberManager() {
         return getNumberIdManagerConfiguration(INTEGER, INTEGER, LONG);
     }
@@ -294,10 +233,6 @@ private static TinkerGraph getTinkerGraphWithClassicNumberManager() {
         return TinkerGraph.open(getConfigurationHWithClassicNumberManager());
     }
 
-    private static TinkerTransactionGraph getTinkerTransactionGraphWithClassicNumberManager() {
-        return TinkerTransactionGraph.open(getConfigurationHWithClassicNumberManager());
-    }
-
     private static Configuration getConfigurationHWithClassicNumberManager() {
         return getNumberIdManagerConfiguration(INTEGER, INTEGER, INTEGER);
     }

tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerWorld.java

@@ -117,11 +117,38 @@ public AbstractTinkerGraph open(final Configuration configuration) {
      * instances required by the Gherkin test suite.
      */
     public static class TinkerTransactionGraphWorld extends TinkerWorld {
-        private static final AbstractTinkerGraph modern = registerTestServices(TinkerFactory.createTxModern());
-        private static final AbstractTinkerGraph classic = registerTestServices(TinkerFactory.createTxClassic());
-        private static final AbstractTinkerGraph crew = registerTestServices(TinkerFactory.createTxTheCrew());
-        private static final AbstractTinkerGraph sink = registerTestServices(TinkerFactory.createTxKitchenSink());
-        private static final AbstractTinkerGraph grateful = registerTestServices(TinkerFactory.createTxGratefulDead());
+        private static final AbstractTinkerGraph modern;
+        private static final AbstractTinkerGraph classic;
+        private static final AbstractTinkerGraph crew;
+        private static final AbstractTinkerGraph sink;
+        private static final AbstractTinkerGraph grateful;
+
+        static {
+            modern = TinkerTransactionGraph.open(getNumberIdManagerConfiguration());
+            TinkerFactory.generateModern(modern);
+            modern.tx().commit();
+            registerTestServices(modern);
+
+            classic = TinkerTransactionGraph.open(getNumberIdManagerConfiguration());
+            TinkerFactory.generateClassic(classic);
+            classic.tx().commit();
+            registerTestServices(classic);
+
+            crew = TinkerTransactionGraph.open(getNumberIdManagerConfiguration());
+            TinkerFactory.generateTheCrew(crew);
+            crew.tx().commit();
+            registerTestServices(crew);
+
+            sink = TinkerTransactionGraph.open(getNumberIdManagerConfiguration());
+            TinkerFactory.generateKitchenSink(sink);
+            sink.tx().commit();
+            registerTestServices(sink);
+
+            grateful = TinkerTransactionGraph.open(getNumberIdManagerConfiguration());
+            TinkerFactory.generateGratefulDead(grateful);
+            grateful.tx().commit();
+            registerTestServices(grateful);
+        }
 
         @Override
         public GraphTraversalSource getGraphTraversalSource(final LoadGraphWith.GraphData graphData) {